From d7f5ebb37211fd8f0424f1e04636be0393a55e7a Mon Sep 17 00:00:00 2001 From: Robert Middleswarth <72569+rmiddle@users.noreply.github.com> Date: Mon, 14 Nov 2022 09:50:17 -0500 Subject: [PATCH] Add mailsail config files to the template --- configs/klipper/mainsail.json | 7 +++++++ stack/klipper.yml | 4 +++- tools/install_klipper.sh | 23 +++++++++++++++++++++++ 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 configs/klipper/mainsail.json diff --git a/configs/klipper/mainsail.json b/configs/klipper/mainsail.json new file mode 100644 index 0000000..a59b2e1 --- /dev/null +++ b/configs/klipper/mainsail.json @@ -0,0 +1,7 @@ +{ + "instancesDB": "json", + "instances": [ + { "hostname": "moonraker", "port": 7125 } + ] +} + diff --git a/stack/klipper.yml b/stack/klipper.yml index 371ea6a..2e8741f 100644 --- a/stack/klipper.yml +++ b/stack/klipper.yml @@ -30,9 +30,11 @@ services: mainsail: hostname: mainsail - image: mkuf/mainsail:latest + image: ghcr.io/mainsail-crew/mainsail:edge ports: - "4070:80" + volumes: + - /portainer/Files/AppData/Config/klipper/mainsail/config.json:/usr/share/nginx/html/config.json restart: unless-stopped networks: - klipper diff --git a/tools/install_klipper.sh b/tools/install_klipper.sh index 8253d1a..1ef10ef 100755 --- a/tools/install_klipper.sh +++ b/tools/install_klipper.sh @@ -5,6 +5,18 @@ function error { exit 1 } +function check_internet() { + printf "Checking if you are online..." + wget -q --spider http://github.com + if [ $? -eq 0 ]; then + echo "Online. Continuing." + else + error "Offline. Go connect to the internet then run the script again." + fi +} + +check_internet + echo "Creating directories..." sudo mkdir -p /portainer/Files/AppData/Config/klipper/klipper/ || error "Failed to create data directory for klipper / klipper!" sudo mkdir -p /portainer/Files/AppData/Config/klipper/klipper/logs || error "Failed to create data directory for klipper / klipper!" @@ -28,6 +40,17 @@ then fi sudo touch /portainer/Files/AppData/Config/klipper/moonraker/moonraker.conf || error "Failed to touch moonraker.conf file!" +if [ -d /portainer/Files/AppData/Config/klipper/mainsail/config.json ]; +then + echo "/portainer/Files/AppData/Config/klipper/mainsail/config.json is a directory removing" + rm -rf '/portainer/Files/AppData/Config/klipper/mainsail/config.json' +fi + +if [ ! -f /portainer/Files/AppData/Config/klipper/mainsail/config.json ]; +then + sudo wget -O /portainer/Files/AppData/Config/klipper/mainsail/config.json https://raw.githubusercontent.com/pi-hosted/pi-hosted/master/configs/klipper/mainsail.json || error "Failed to download mainsail config file!" +fi + echo "Setting permissions..." sudo chown -R 1000:1000 /portainer/Files/AppData/Config/klipper/ || error "Failed to set permissions for klipper data!" echo "Done You are ready to goto next step."