From ada57841681ebc0baa40402bd653723fa94ebc01 Mon Sep 17 00:00:00 2001 From: Nikolay Kopitonenko Date: Wed, 14 Aug 2024 23:41:15 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=20mainsail?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- goss.yaml | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++- helper_post | 33 +++++++++++++++++++++++++++++--- 2 files changed, 84 insertions(+), 4 deletions(-) diff --git a/goss.yaml b/goss.yaml index bff122a..263b0c1 100644 --- a/goss.yaml +++ b/goss.yaml @@ -39,6 +39,20 @@ file: group: pi mode: "0755" + /home/pi/mainsail: + filetype: directory + exists: true + owner: pi + group: pi + mode: "0755" + + /home/pi/mainsail/.git: + filetype: directory + exists: true + owner: pi + group: pi + mode: "0000" + /home/pi/.octoprint/config.yaml: exists: true filetype: file @@ -113,10 +127,49 @@ file: contents: | pi ALL=(ALL) NOPASSWD: ALL + /etc/init.d/nginx: + exists: true + filetype: file + owner: root + group: root + mode: "0755" + + /etc/nginx/conf.d/default.conf: + exists: false + + /etc/nginx/sites-enabled/default: + exists: false + + /etc/nginx/conf.d/mainsail.conf: + exists: true + filetype: file + owner: root + group: root + mode: "0644" + md5: 3426243d4230c11bd4154498cc4f2fe7 + + /etc/nginx/sites-enabled/mainsail: + exists: true + filetype: file + owner: root + group: root + mode: "0644" + + /etc/haproxy/haproxy.cfg: + exists: true + filetype: file + owner: root + group: root + mode: "0644" + md5: 6f16423d3bbe2ad00bf8aac1cad3420f + service: klipper: name: klipper enabled: true + nginx: + name: nginx + enabled: true octoprint: name: octoprint - enabled: false + enabled: true diff --git a/helper_post b/helper_post index 9c9eedd..c357cec 100755 --- a/helper_post +++ b/helper_post @@ -21,6 +21,33 @@ set -xe } install -m644 -o 0 -g 0 $ConfigsHome/etc/default/klipper /etc/default/klipper -systemctl enable klipper 2>/dev/null -systemctl disable octoprint 2>/dev/null -systemctl restart klipper 2>/dev/null & +# Mainsail +[ -e /home/pi/mainsail ] && { + su - pi -c "cd /home/pi/mainsail \ + && chmod 755 .git \ + && git pull \ + " + : +} || { + su - pi -c "cd /home/pi \ + && git clone --depth=1 $GITEA_BASE/mainsail.git \ + && (cd mainsail && git config pull.rebase false) \ + " +} +chmod 0 /home/pi/mainsail/.git + +apt-get -y install nginx +rm -f /etc/nginx/conf.d/default.conf +rm -f /etc/nginx/sites-enabled/default + +install -m644 -o 0 -g 0 $ConfigsHome/etc/haproxy/haproxy.cfg /etc/haproxy/haproxy.cfg + +bash -c ' +systemctl enable klipper +systemctl unmask nginx +systemctl enable nginx +systemctl enable octoprint +systemctl restart haproxy +systemctl restart nginx +systemctl restart klipper +' 2>/dev/null &