-
-
Notifications
You must be signed in to change notification settings - Fork 488
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix: detect RatOS 2.1+ as operating system and exit #490
Conversation
Signed-off-by: Dominik Willner <th33xitus@gmail.com>
Just for future reference to anyone who may come across this, i requested this check to avoid people unknowingly breaking their RatOS installations. KIAUH and RatOS share many of the same goals, and there are plenty of opportunities for future symbiosis which we should definitely pursue, but it requires some devops investment on RatOS's part to get to a place where things can be installed and uninstalled at will etc, it is definitely worth it however and it fits in perfectly with future goals. Thank you @dw-0 for being so accommodating and thank you for all you've done for the community, KIAUH is a staple of the klipper ecosystem for good reason and so this is not a goodbye, but a "see you soon"! I'll be in touch :) |
@dw-0 yeah I brought this up to Mikkel a while back but he ignored me because I was also calling out his inaccuracies about canbus. |
@dw-0 best I can remember, kiahu replaces the upstream.conf file. I think the fix would be to do a sed to add the lines needed with kiauh instead of replacing the file should fix it. |
RatOS requires a custom upstreams.conf and uses a custom mainsail nginx config. Both files are modified so that it works on RatOS and its own webapps. Mikkl and i decided to take this step until we figure out a proper way to implement compatibility. |
Correct, I found this issue shortly after 2.1 was released, and discovered it was the upstream.conf file that changed and stopped the custom pages from working. I haven't looked deeply into the differences between the files that 2.1 needs and the changes kiauh does. That is the suggestion that I was giving to use sed to add what is needed without a full replacement of nginx's config files. Is that what kiauh does is replace the files from the script or does it change the contents of the file? |
And if I'm not mistaken, when I discovered this issue and replaced the upstream.conf file with the original one with ratos, I didn't change any other files for mainsail and both have been working properly. I can double check that a bit later today to make sure if there was any other changes that I made to make it work with both fluidd and mainsail. |
Ok so I went back and looked at the changes that I made to get it working, and the only change I made was to add upstream configurator { back to upstream.conf after installing fluidd with kiauh as I put here #478. Since I wasn't needing to make any changes to mainsail, there wasn't any need to run the mainsail portion. Best I can tell the only differences between the kiauh's version of the sites-available/mainsail and RatOS's version is RatOS has listen 80 default_server and a location=/vcore.log section that kiauh's only has listen 80. When I brought this up in RatOS discord I was told that RatOS is designed to use mainsail and dismissed after that. Since it was kiauh that changed the operation of this, that's why I posted the issue here. Correct me if I'm wrong, but does kiauh do a check for existing nginx files if doing an install of mainsail or fluidd? If it does, it does look like the operation is to copy over the preconfiged files, such as site-avaliable/mainsail or fluidd and the preconfigured upstream.conf. This is where I suggested, to keep kiauh from breaking RatOS or any other preconfigured Klipper OS that may already exist or will exist in the future, it might be better for kiauh to parse through the existing files and only add missing sections with the sed command instead of over writting the file as it exists, and only copy the preconfigured file over if the file is missing completely. However I do believe that Mikkel will dismiss anything I suggest because of the history I have with him. |
* Added Beacon to update, remove, and install menus * Update beacon.sh * fix: detect RatOS 2.1+ as operating system and exit (dw-0#490) Signed-off-by: Dominik Willner <th33xitus@gmail.com> * fix: parse moonraker dependencies from system-dependencies.json (dw-0#492) Signed-off-by: Dominik Willner <th33xitus@gmail.com> * readme: fix broken OctoApp plugin link (dw-0#494) --------- Signed-off-by: Dominik Willner <th33xitus@gmail.com> Co-authored-by: dw-0 <th33xitus@gmail.com> Co-authored-by: Henrik Fransson <hmf.hmf.hmf@gmail.com>
commit 4cf523a Merge: 1d06bf7 694a4c2 Author: dw-0 <th33xitus@gmail.com> Date: Sun Sep 8 19:04:19 2024 +0200 Merge pull request dw-0#524 from dw-0/develop Merge develop into master commit 694a4c2 Author: dw-0 <th33xitus@gmail.com> Date: Sun Sep 8 18:58:07 2024 +0200 fix: typo in "origin" and "managed_services" (dw-0#520) * fix: typo in "origin" and "managed_services" for klipperscreen update manager config Signed-off-by: Dominik Willner <th33xitus@gmail.com> * fix: typo in "origin" for moonraker telegram bot update manager config Signed-off-by: Dominik Willner <th33xitus@gmail.com> --------- Signed-off-by: Dominik Willner <th33xitus@gmail.com> commit a54514c Author: dw-0 <th33xitus@gmail.com> Date: Thu Sep 5 20:31:38 2024 +0200 fix: fix switching of repositories (dw-0#519) * fix: fix repo switching Extend the functionality of repo switching by creating a backup before the switch. Also implement a rollback mechanic in case of an error. Signed-off-by: Dominik Willner <th33xitus@gmail.com> * refactor: fail when installing requirements fails Signed-off-by: Dominik Willner <th33xitus@gmail.com> * refactor: display owner and repo in main menu on separate lines long owner and repo names would case the menu to be too wide Signed-off-by: Dominik Willner <th33xitus@gmail.com> --------- Signed-off-by: Dominik Willner <th33xitus@gmail.com> commit 1d06bf7 Merge: 0ee0fa3 e438081 Author: dw-0 <th33xitus@gmail.com> Date: Sun Sep 1 19:02:48 2024 +0200 Merge pull request dw-0#511 from dw-0/develop Merge develop into master commit e438081 Author: dw-0 <th33xitus@gmail.com> Date: Sun Sep 1 18:51:25 2024 +0200 fix: update SimpleConfigParser submodule (dw-0#510) commit 9f50f6f Author: dw-0 <th33xitus@gmail.com> Date: Sun Sep 1 18:31:15 2024 +0200 fix: y and n are invalid selections in KlipperFlashOverviewMenu (dw-0#508) Signed-off-by: Dominik Willner <th33xitus@gmail.com> commit 0ee0fa3 Author: dw-0 <th33xitus@gmail.com> Date: Sat Aug 31 19:16:52 2024 +0200 feat: KIAUH v6 - full rewrite of KIAUH in Python (dw-0#428) commit 8547942 Author: Henrik Fransson <hmf.hmf.hmf@gmail.com> Date: Tue Aug 6 16:41:18 2024 +0200 readme: fix broken OctoApp plugin link (dw-0#494) commit d33ac6b Author: dw-0 <th33xitus@gmail.com> Date: Sat Aug 3 13:30:34 2024 +0200 fix: parse moonraker dependencies from system-dependencies.json (dw-0#492) Signed-off-by: Dominik Willner <th33xitus@gmail.com> commit 6cd9133 Author: dw-0 <th33xitus@gmail.com> Date: Wed Jul 31 20:30:33 2024 +0200 fix: detect RatOS 2.1+ as operating system and exit (dw-0#490) Signed-off-by: Dominik Willner <th33xitus@gmail.com> commit a929c69 Author: Beans Baxter <24848012+BeansIsFat@users.noreply.github.com> Date: Fri Jun 28 17:07:20 2024 -0400 refactor: don't check spoolman version if not installed (dw-0#487) commit bce9200 Author: breakheart <llllg324@gmail.com> Date: Fri Jun 28 23:46:19 2024 +0800 fix: use correct Spoolman directory name (dw-0#486) commit 7993b98 Author: Alessandro Maggi <59124971+DicyRoll@users.noreply.github.com> Date: Wed Jun 26 07:04:09 2024 +0200 fix: replace jq by grep to check Spoolman update (dw-0#482) * fix: remove extra space in remove menu * fix(spoolman): replace jq with grep jq isn't included in some minimal installations commit 62296e1 Author: Alessandro Maggi <59124971+DicyRoll@users.noreply.github.com> Date: Tue Jun 25 20:10:14 2024 +0200 feat: add Spoolman support (dw-0#477) commit a374ac8 Author: Justin Otherguy <justin@justinotherguy.org> Date: Thu May 9 20:56:16 2024 +0200 fix: add unzip to dependencies for Mainsail and Fluidd
Signed-off-by: Dominik Willner th33xitus@gmail.com