From 21b72945cb064a844b3e8be9aa410c9279a881cc Mon Sep 17 00:00:00 2001 From: Aitor Iturrioz Date: Wed, 6 Mar 2024 17:59:40 +0100 Subject: [PATCH 01/30] Remove optional services All this services will be available as docker packages through the iombian sevices marketplace Signed-off-by: Aitor Iturrioz --- stage9/03-mosquitto/00-run.sh | 11 --- .../03-mosquitto/files/mosquitto-buster.list | 1 - .../03-mosquitto/files/mosquitto-repo.gpg.key | 52 ------------- stage9/04-nodejs/00-packages | 1 - stage9/04-nodejs/00-run.sh | 6 -- stage9/05-node-red/00-run-chroot.sh | 75 ------------------- stage9/05-node-red/00-run.sh | 4 - stage9/06-mqtt-web-client/00-packages | 1 - stage9/06-mqtt-web-client/01-run-chroot.sh | 13 ---- stage9/06-mqtt-web-client/01-run.sh | 3 - .../files/systemd/mqtt-web-client.service | 11 --- stage9/07-postfix/00-debconf | 2 - stage9/07-postfix/00-packages | 4 - stage9/07-postfix/00-run-chroot.sh | 3 - stage9/08-monit/00-packages | 1 - stage9/08-monit/01-run.sh | 13 ---- stage9/08-monit/files/default | 7 -- stage9/08-monit/files/systemd/monit.service | 18 ----- stage9/08-monit/files/templates/rootbin | 4 - stage9/08-monit/files/templates/rootrc | 4 - stage9/08-monit/files/templates/rootstrict | 4 - stage9/09-samba/00-packages | 2 - stage9/09-samba/01-run-chroot.sh | 8 -- .../10-iombian-shutdown-handler/00-packages | 2 - stage9/10-iombian-shutdown-handler/01-run.sh | 29 ------- .../iombian-shutdown-handler | 1 - stage9/11-iombian-button-handler/00-packages | 2 - stage9/11-iombian-button-handler/01-run.sh | 29 ------- .../iombian-button-handler | 1 - .../00-packages | 2 - .../12-iombian-system-info-provider/01-run.sh | 29 ------- .../iombian-system-info-provider | 1 - stage9/17-wetty/00-packages | 1 - stage9/17-wetty/00-run-chroot.sh | 14 ---- stage9/17-wetty/00-run.sh | 3 - stage9/17-wetty/files/systemd/wetty.service | 17 ----- stage9/18-boringproxy/00-packages | 1 - stage9/18-boringproxy/00-run-chroot.sh | 12 --- stage9/19-iombian-tunnels-handler/00-packages | 2 - stage9/19-iombian-tunnels-handler/01-run.sh | 29 ------- stage9/19-iombian-tunnels-handler/02-run.sh | 7 -- .../iombian-tunnels-handler | 1 - .../20-iombian-services-uploader/00-packages | 2 - stage9/20-iombian-services-uploader/01-run.sh | 29 ------- stage9/20-iombian-services-uploader/02-run.sh | 7 -- .../iombian-services-uploader | 1 - .../00-packages | 2 - .../21-iombian-system-info-uploader/01-run.sh | 29 ------- .../21-iombian-system-info-uploader/02-run.sh | 7 -- .../iombian-system-info-uploader | 1 - 50 files changed, 509 deletions(-) delete mode 100755 stage9/03-mosquitto/00-run.sh delete mode 100644 stage9/03-mosquitto/files/mosquitto-buster.list delete mode 100644 stage9/03-mosquitto/files/mosquitto-repo.gpg.key delete mode 100755 stage9/04-nodejs/00-packages delete mode 100755 stage9/04-nodejs/00-run.sh delete mode 100755 stage9/05-node-red/00-run-chroot.sh delete mode 100755 stage9/05-node-red/00-run.sh delete mode 100755 stage9/06-mqtt-web-client/00-packages delete mode 100755 stage9/06-mqtt-web-client/01-run-chroot.sh delete mode 100755 stage9/06-mqtt-web-client/01-run.sh delete mode 100644 stage9/06-mqtt-web-client/files/systemd/mqtt-web-client.service delete mode 100644 stage9/07-postfix/00-debconf delete mode 100755 stage9/07-postfix/00-packages delete mode 100755 stage9/07-postfix/00-run-chroot.sh delete mode 100755 stage9/08-monit/00-packages delete mode 100644 stage9/08-monit/01-run.sh delete mode 100644 stage9/08-monit/files/default delete mode 100644 stage9/08-monit/files/systemd/monit.service delete mode 100644 stage9/08-monit/files/templates/rootbin delete mode 100644 stage9/08-monit/files/templates/rootrc delete mode 100644 stage9/08-monit/files/templates/rootstrict delete mode 100755 stage9/09-samba/00-packages delete mode 100644 stage9/09-samba/01-run-chroot.sh delete mode 100755 stage9/10-iombian-shutdown-handler/00-packages delete mode 100755 stage9/10-iombian-shutdown-handler/01-run.sh delete mode 160000 stage9/10-iombian-shutdown-handler/iombian-shutdown-handler delete mode 100755 stage9/11-iombian-button-handler/00-packages delete mode 100755 stage9/11-iombian-button-handler/01-run.sh delete mode 160000 stage9/11-iombian-button-handler/iombian-button-handler delete mode 100755 stage9/12-iombian-system-info-provider/00-packages delete mode 100755 stage9/12-iombian-system-info-provider/01-run.sh delete mode 160000 stage9/12-iombian-system-info-provider/iombian-system-info-provider delete mode 100755 stage9/17-wetty/00-packages delete mode 100755 stage9/17-wetty/00-run-chroot.sh delete mode 100755 stage9/17-wetty/00-run.sh delete mode 100644 stage9/17-wetty/files/systemd/wetty.service delete mode 100755 stage9/18-boringproxy/00-packages delete mode 100755 stage9/18-boringproxy/00-run-chroot.sh delete mode 100755 stage9/19-iombian-tunnels-handler/00-packages delete mode 100755 stage9/19-iombian-tunnels-handler/01-run.sh delete mode 100755 stage9/19-iombian-tunnels-handler/02-run.sh delete mode 160000 stage9/19-iombian-tunnels-handler/iombian-tunnels-handler delete mode 100755 stage9/20-iombian-services-uploader/00-packages delete mode 100755 stage9/20-iombian-services-uploader/01-run.sh delete mode 100755 stage9/20-iombian-services-uploader/02-run.sh delete mode 160000 stage9/20-iombian-services-uploader/iombian-services-uploader delete mode 100755 stage9/21-iombian-system-info-uploader/00-packages delete mode 100755 stage9/21-iombian-system-info-uploader/01-run.sh delete mode 100755 stage9/21-iombian-system-info-uploader/02-run.sh delete mode 160000 stage9/21-iombian-system-info-uploader/iombian-system-info-uploader diff --git a/stage9/03-mosquitto/00-run.sh b/stage9/03-mosquitto/00-run.sh deleted file mode 100755 index b758348..0000000 --- a/stage9/03-mosquitto/00-run.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -e - -install -m 644 files/mosquitto-buster.list ${ROOTFS_DIR}/etc/apt/sources.list.d/ - -on_chroot apt-key add - < files/mosquitto-repo.gpg.key - -on_chroot << EOF -apt-get update -apt-get install -y mosquitto mosquitto-clients -systemctl enable mosquitto -EOF diff --git a/stage9/03-mosquitto/files/mosquitto-buster.list b/stage9/03-mosquitto/files/mosquitto-buster.list deleted file mode 100644 index 5e79f3c..0000000 --- a/stage9/03-mosquitto/files/mosquitto-buster.list +++ /dev/null @@ -1 +0,0 @@ -deb https://repo.mosquitto.org/debian buster main diff --git a/stage9/03-mosquitto/files/mosquitto-repo.gpg.key b/stage9/03-mosquitto/files/mosquitto-repo.gpg.key deleted file mode 100644 index 05a4545..0000000 --- a/stage9/03-mosquitto/files/mosquitto-repo.gpg.key +++ /dev/null @@ -1,52 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -mQINBFDnU4UBEADbtHyC/CR1OXZo0s5+nxLYtvXAVSJU0T+I91e+iJAeayyzH0iI -33l12L9N20Q+eYfELelX61NIU++u+xi5wa6/R/L+Aeu3P2E/dQmtYx8zzjjPhQQm -lnX3huaMoqBxHthvD+XJjKwHHJbyDzcdJGodN2nUsqCfUgcAgS7ZME8xYz83U5iH -/deHgpWBjtI5VNV/GDJc/oi1dh8V+I5fzxRjl3/tiCiM8w1zMBs2oxBJ5JgC4wvy -uj7y8c6iysAFXk7fSnplsZFj/bNvIhCKH0Cr93Dv/3kLy5bkZxsmqOd4MdQTVwae -Eb/F7uK8uQ7Hios6mKReWfsFuuDfXZi2D7GYhpQTdg1fZJ3Ca0woSDQPUJe9rIJn -olHC37in1n2g5VtR3chSIqsqgGARDwguyAzEJETYPpZy+sgpLKbN/8mSeGYNihfM -23susBAM+WyKPEdWu9aTkFBsn76WL6SCIyiWMNukQ9UD8XdbM6rNR6LhdBUg7g2y -uu42k3yo7h7Z8t5LkRrack234KE+vCcGP33OgMiOoEivDMR1UvZDn8i0flU/z+O/ -oJiUjt1S4TBYeLKknxyKyW0Ducz5GnW7ZRIDT9ibfuhlxN4MmktRIXLY2by9njYB -08F/lAyH1nRASl/UgMp9t4rcqr5fnnLNlxJgBoP11xviyvzAzTey9N/W/QARAQAB -tC1Nb3NxdWl0dG8gQXB0IFJlcG9zaXRvcnkgPHJlcG9AbW9zcXVpdHRvLm9yZz6J -AlUEEwEKAD8CGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAFiEEgnfMtJ7FtZXy -0scTYWEa5DCZNiMFAl4MhdQFCR/xNU8ACgkQYWEa5DCZNiMHaxAAsVZ6VoyQFccA -4q2af5RPSiS+aL9w1dAHlqb5fJSGibEre5Ux2954Qss8EheH1YN9YE/LaCLe9xhg -ZQ8upx2qVahK3QJ0t/Wh71U7ZHN4DdF4owgr5nfPGxGZ7wyEdk2E+eaW1NpS251p -K4K4EIOr++r/cp+T92Jt9z05V5aahurUbwXAstfTgAs/0Qw+U243Gf0i5cLDL436 -n5CdVLv3JZGT46DDcNkNk1HBYe/INIZH2TSVlSMLvm6L53yfSWtSOufUUWFFvMe8 -awpWvKte73Juzh5KvrCklVRLJnQjGZVXc7XwZS9tXvMMnqnwNka+FcHuP0YONepo -yQicktcOXLxkuRoyajMaiHRrXWsa32C9/IjpAkC0Jz3Mz45vr3ElfwJ6bkQshdqR -CcehiMCvTQlwmTQixP9ZXTGceh0Yd3MS8TWwiYP1Rq77cGMaj5thngYfpkOFUUsh -TqHDqfbpEwZMjfaPR9UAH6tbNQeI2qMOxIiE4+ABD3HTyWAMnqrVzHelHjSSrmMv -5/EZ4orXwtw7nlYiwB1VoOTIIK84brQJWFFw82Ktwi6mDdqNJ+sdqB2RefDLTvsP -WBalVWjirUPrCYbQvHln9ldDP0KTkws1J4oKb+PpBxEtaAa7RR3G9HRbiIOpEIBY -ItcCoyWRpCRy+sP6Zxju6eiXD1dDgPK5Ag0EUOdThQEQAMSouQQEEk0V7uS7vWIu -wUrZMwSU9kxh7zqaPJCnezIMY8GLJXFVROL9bWESv+Ny7c9xg8J/fiYfOWp7LJov -u+thrdaQ2x1yWb5zkU4ZmHESX/asb5hqEAggcxHbqzCViqGH94hzD35yXV/PkR3R -BLuSUiOX+F4edyU8OqJ8KgmEsS8xu17877vb4tc6NFhW8tFzzG8ibWF+diIVBsOa -tH2ZIncTX25Er+rW6rT7DUjvAJAkaGmtdbx5Mreyw72Lvs7Pu9/K/wwSsfayE9ob -HzovsQQdwQ75l20y5fQ9Wb3/6LU3rydkDQn7rquqxQIuBMc3e85I/ECGkXv3qVuh -8Las3/78RwRtw5RQNv2D/RO78hgC6wiHPGMpqvHeheHU4OMLZN1aoUxZ3Uiwo6kb -MeFfDlTY2A39wAScjSa+mgipeYQQhnooflomDfqMxDB68bVwPUprAYSpHip++sGx -Sp2Rwpf97QssbAF3LES11X7wsmqCbkXxjAqJkqJyU/OB6TGrdWp3cNvLWodg7ewH -wr17ePw+83MXsUHklYJjk9F/R+Grq4Ut2tkKm03QC3M6Tfa6QZj8JqdOYc+kF1G2 -wueiFr23vlnIMm8fGFwgRLNUJQ9a8xHSCk1uhwHnTnyx219I+V987Y6cjLbukCIW -lgVQR9IAlovyNSs35XRy0+6bABEBAAGJAjwEGAEKACYCGwwWIQSCd8y0nsW1lfLS -xxNhYRrkMJk2IwUCXgyGDAUJH/E1hwAKCRBhYRrkMJk2IwHoEADSaT3T0TYIpuzJ -NCOjMHznfHWXYWyI+M89r3yeXfoSYD+kDKfM5MAGptNZrp/AhL8CP9LXI5/yrkYq -d283PBWrSKHmQkLOZIp2iv4b6W4khWniC2dfyPcHfEnOxcdbSag16E4r6sM6oi8W -XwgWVwC9XvGxpJj85og19VyjYmPCYtpEgXQot432sDcxAeIbAdJnDuQBHzm1e4sC -5dW96aDlLkClN5Gd8bzscTnyt7icPpy+QxcJR5Ih49dh/0LyJBNIsrNyE83vtXaa -4Sd78FXA0zdlPCrIVxIh0RQ5soNZUIylh/vXK9LzYJIJYULFZGhsiZ+l5fUU8zSS -Btf5a4jDtkRWOHxc5A76Wm/gJVqJ9JHHJRQOuBeQGL2RpSdKQcLzAN2MHx6il95o -prgSuYpTy4tv/FeI/xItwFwZwc99qy+SPnks831efleFse71v9uzZ9xRd7GTpj5i -1OAP/IcpIFd6dsqTAlVoel+sNvE1HjUlIDre87UoqIzjs+DVXl/FocLDIub7Zcb4 -zpLmwZrYQpWMcnDcwFKko3i0Jso2gSZdRkjXahbUrv7yUmehbiUslun3la/Ga++S -Jl+ToCeR7Mwd13j6yl+PhkBHrjE/Mh/mLN3jhFaHEbhn+VecAM5XgDVn3LMmo48U -s0CcAA8PgqiftljzfmpNypsDsO1FmQ== -=pZgG ------END PGP PUBLIC KEY BLOCK----- diff --git a/stage9/04-nodejs/00-packages b/stage9/04-nodejs/00-packages deleted file mode 100755 index 13368f8..0000000 --- a/stage9/04-nodejs/00-packages +++ /dev/null @@ -1 +0,0 @@ -curl diff --git a/stage9/04-nodejs/00-run.sh b/stage9/04-nodejs/00-run.sh deleted file mode 100755 index 5115312..0000000 --- a/stage9/04-nodejs/00-run.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -e - -on_chroot << EOF -bash <(curl -sL https://deb.nodesource.com/setup_18.x) -apt-get install -y nodejs -EOF \ No newline at end of file diff --git a/stage9/05-node-red/00-run-chroot.sh b/stage9/05-node-red/00-run-chroot.sh deleted file mode 100755 index 3e2ca84..0000000 --- a/stage9/05-node-red/00-run-chroot.sh +++ /dev/null @@ -1,75 +0,0 @@ -#!/bin/bash -e - -NODERED_VERSION=3.1.0 - -NODERED_USER=$FIRST_USER_NAME -NODERED_GROUP=$FIRST_USER_NAME -NODERED_HOME=$( getent passwd "$NODERED_USER" | cut -d: -f6 ) - -# install node-red package -npm i -g --unsafe-perm --no-progress node-red@$NODERED_VERSION - -# set local folder -mkdir -p "$NODERED_HOME/.node-red/node_modules" -chown -Rf $NODERED_USER:$NODERED_GROUP $NODERED_HOME/.node-red/ -pushd "$NODERED_HOME/.node-red" -npm config set update-notifier false - -# create package.json -if [ ! -f "package.json" ]; then - echo '{' > package.json - echo ' "name": "node-red-project",' >> package.json - echo ' "description": "A Node-RED Project",' >> package.json - echo ' "version": "0.0.1",' >> package.json - echo ' "dependencies": {' >> package.json - echo ' }' >> package.json - echo '}' >> package.json -fi - -# install bcryptjs library -npm i --unsafe-perm --save --no-progress bcryptjs - -# install extra Pi nodes -EXTRANODES="node-red-node-pi-gpio node-red-node-random node-red-node-ping node-red-contrib-play-audio node-red-node-smooth node-red-node-serialport" -npm i --unsafe-perm --save --no-progress $EXTRANODES - -# install Industry4.0 nodes -INDUSTRYNODES="node-red-contrib-iiot-opcua" -npm i --unsafe-perm --save --no-progress $INDUSTRYNODES - -# reset permissions -popd -mkdir -p "$NODERED_HOME/.npm" -chown -Rf $NODERED_USER:$NODERED_GROUP $NODERED_HOME/.npm -chown -Rf $NODERED_USER:$NODERED_GROUP $NODERED_HOME/.node-red/ - -# start/stop/log scripts -mkdir -p /usr/bin -curl -sL -o /usr/bin/node-red-start https://raw.githubusercontent.com/node-red/linux-installers/master/resources/node-red-start -curl -sL -o /usr/bin/node-red-stop https://raw.githubusercontent.com/node-red/linux-installers/master/resources/node-red-stop -curl -sL -o /usr/bin/node-red-restart https://raw.githubusercontent.com/node-red/linux-installers/master/resources/node-red-restart -curl -sL -o /usr/bin/node-red-reload https://raw.githubusercontent.com/node-red/linux-installers/master/resources/node-red-reload -curl -sL -o /usr/bin/node-red-log https://raw.githubusercontent.com/node-red/linux-installers/master/resources/node-red-log -curl -sL -o /etc/logrotate.d/nodered https://raw.githubusercontent.com/node-red/linux-installers/master/resources/nodered.rotate -chmod +x /usr/bin/node-red-start -chmod +x /usr/bin/node-red-stop -chmod +x /usr/bin/node-red-restart -chmod +x /usr/bin/node-red-reload -chmod +x /usr/bin/node-red-log - -# add systemd script -curl -sL -o /lib/systemd/system/nodered.service https://raw.githubusercontent.com/node-red/linux-installers/master/resources/nodered.service -sed -i 's#^User=pi#User='$NODERED_USER'#;s#^Group=pi#Group='$NODERED_GROUP'#;s#^WorkingDirectory=/home/pi#WorkingDirectory='$NODERED_HOME'#;' /lib/systemd/system/nodered.service - -# remove unneeded large sentiment library to save space and load time -rm -f /usr/lib/node_modules/node-red/node_modules/multilang-sentiment/build/output/build-all.json - -# on Pi, add cpu temp example, make sure ping works -if grep -q BCM2 /proc/cpuinfo; then - setcap cap_net_raw+eip $(which node) - setcap cap_net_raw=ep /bin/ping - adduser $NODERED_USER gpio 2>&1 -fi - -# enable systemd service -systemctl enable nodered.service diff --git a/stage9/05-node-red/00-run.sh b/stage9/05-node-red/00-run.sh deleted file mode 100755 index 25c0856..0000000 --- a/stage9/05-node-red/00-run.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -e - -mkdir -p ${ROOTFS_DIR}/home/${FIRST_USER_NAME}/.node-red -mkdir -p ${ROOTFS_DIR}/home/${FIRST_USER_NAME}/.npm diff --git a/stage9/06-mqtt-web-client/00-packages b/stage9/06-mqtt-web-client/00-packages deleted file mode 100755 index 5664e30..0000000 --- a/stage9/06-mqtt-web-client/00-packages +++ /dev/null @@ -1 +0,0 @@ -git diff --git a/stage9/06-mqtt-web-client/01-run-chroot.sh b/stage9/06-mqtt-web-client/01-run-chroot.sh deleted file mode 100755 index e4bf4a0..0000000 --- a/stage9/06-mqtt-web-client/01-run-chroot.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -e - -INSTALLATION_PATH="/opt/hivemq-mqtt-web-client" - -if [ -d "$INSTALLATION_PATH" ]; then - rm -rf ${INSTALLATION_PATH} -fi - -git clone https://github.com/hivemq/hivemq-mqtt-web-client.git $INSTALLATION_PATH -chown -R $FIRST_USER_NAME:$FIRST_USER_NAME $INSTALLATION_PATH - -# enable systemd service -systemctl enable mqtt-web-client.service diff --git a/stage9/06-mqtt-web-client/01-run.sh b/stage9/06-mqtt-web-client/01-run.sh deleted file mode 100755 index 5ebf525..0000000 --- a/stage9/06-mqtt-web-client/01-run.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -e - -install -m 644 -g root -o root files/systemd/mqtt-web-client.service ${ROOTFS_DIR}/etc/systemd/system diff --git a/stage9/06-mqtt-web-client/files/systemd/mqtt-web-client.service b/stage9/06-mqtt-web-client/files/systemd/mqtt-web-client.service deleted file mode 100644 index 9008f02..0000000 --- a/stage9/06-mqtt-web-client/files/systemd/mqtt-web-client.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=MQTT Web Client - -[Service] -Type=simple -WorkingDirectory=/opt/hivemq-mqtt-web-client -ExecStart=/usr/bin/python3 -m http.server 1888 -ExecStop=/bin/kill `/bin/ps aux | /bin/grep http.server | /bin/grep -v grep | /usr/bin/awk '{ print $2 }'` - -[Install] -WantedBy=multi-user.target diff --git a/stage9/07-postfix/00-debconf b/stage9/07-postfix/00-debconf deleted file mode 100644 index 9c8a906..0000000 --- a/stage9/07-postfix/00-debconf +++ /dev/null @@ -1,2 +0,0 @@ -postfix postfix/mailname string ${TARGET_HOSTNAME}.local -postfix postfix/main_mailer_type string 'Internet Site' diff --git a/stage9/07-postfix/00-packages b/stage9/07-postfix/00-packages deleted file mode 100755 index 2a7fba7..0000000 --- a/stage9/07-postfix/00-packages +++ /dev/null @@ -1,4 +0,0 @@ -mailutils -libsasl2-2 -libsasl2-modules -ca-certificates diff --git a/stage9/07-postfix/00-run-chroot.sh b/stage9/07-postfix/00-run-chroot.sh deleted file mode 100755 index 8980cc9..0000000 --- a/stage9/07-postfix/00-run-chroot.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -e - -apt-get install --assume-yes postfix diff --git a/stage9/08-monit/00-packages b/stage9/08-monit/00-packages deleted file mode 100755 index 06b8974..0000000 --- a/stage9/08-monit/00-packages +++ /dev/null @@ -1 +0,0 @@ -monit diff --git a/stage9/08-monit/01-run.sh b/stage9/08-monit/01-run.sh deleted file mode 100644 index 1625233..0000000 --- a/stage9/08-monit/01-run.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -e - -# Configuration -install -m 644 -g root -o root files/default ${ROOTFS_DIR}/etc/default/monit -rm -f ${ROOTFS_DIR}/etc/monit/conf-available/* -install -m 644 -g root -o root files/templates/* ${ROOTFS_DIR}/etc/monit/templates/ - -# Systemd service -install -m 644 -g root -o root files/systemd/monit.service ${ROOTFS_DIR}/lib/systemd/system -on_chroot << EOF -systemctl enable monit -mkdir -p /etc/monit/conf-enabled -EOF diff --git a/stage9/08-monit/files/default b/stage9/08-monit/files/default deleted file mode 100644 index 72f32c8..0000000 --- a/stage9/08-monit/files/default +++ /dev/null @@ -1,7 +0,0 @@ -# /etc/default/monit - -# Set START to yes to start the monit -START=yes - -# Options to pass to monit -MONIT_OPTS="-l syslog" diff --git a/stage9/08-monit/files/systemd/monit.service b/stage9/08-monit/files/systemd/monit.service deleted file mode 100644 index ae4b8bb..0000000 --- a/stage9/08-monit/files/systemd/monit.service +++ /dev/null @@ -1,18 +0,0 @@ -[Unit] -Description=Pro-active monitoring utility for unix systems -Wants=network.target multi-user.target cloud-init.target -After=network.target multi-user.target cloud-init.target -ConditionPathExists=!/etc/monit-stopped - -[Service] -EnvironmentFile=-/etc/default/monit -ExecStartPre=/bin/sh -c "test x$START = xyes || exit 1" -ExecStart=/usr/bin/monit -I $MONIT_OPTS -ExecStop=/usr/bin/monit quit -ExecReload=/usr/bin/monit reload -KillMode=process -Restart=on-failure -Type=simple - -[Install] -WantedBy=multi-user.target diff --git a/stage9/08-monit/files/templates/rootbin b/stage9/08-monit/files/templates/rootbin deleted file mode 100644 index 79e9a9b..0000000 --- a/stage9/08-monit/files/templates/rootbin +++ /dev/null @@ -1,4 +0,0 @@ - if failed checksum then alert - if failed permission 755 then unmonitor - if failed uid root then unmonitor - if failed gid root then unmonitor diff --git a/stage9/08-monit/files/templates/rootrc b/stage9/08-monit/files/templates/rootrc deleted file mode 100644 index fdfd1e1..0000000 --- a/stage9/08-monit/files/templates/rootrc +++ /dev/null @@ -1,4 +0,0 @@ - if changed checksum then alert - if failed permission 644 then unmonitor - if failed uid root then unmonitor - if failed gid root then unmonitor diff --git a/stage9/08-monit/files/templates/rootstrict b/stage9/08-monit/files/templates/rootstrict deleted file mode 100644 index 2fa6117..0000000 --- a/stage9/08-monit/files/templates/rootstrict +++ /dev/null @@ -1,4 +0,0 @@ - if failed checksum then unmonitor - if failed permission 600 then unmonitor - if failed uid root then unmonitor - if failed gid root then unmonitor diff --git a/stage9/09-samba/00-packages b/stage9/09-samba/00-packages deleted file mode 100755 index b65b5d6..0000000 --- a/stage9/09-samba/00-packages +++ /dev/null @@ -1,2 +0,0 @@ -samba -samba-common-bin \ No newline at end of file diff --git a/stage9/09-samba/01-run-chroot.sh b/stage9/09-samba/01-run-chroot.sh deleted file mode 100644 index abc0743..0000000 --- a/stage9/09-samba/01-run-chroot.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -e - -# Create 'data' folder -mkdir -p /data - -# Set owership and permissions -chown $FIRST_USER_NAME:$FIRST_USER_NAME /data -chmod 700 /data \ No newline at end of file diff --git a/stage9/10-iombian-shutdown-handler/00-packages b/stage9/10-iombian-shutdown-handler/00-packages deleted file mode 100755 index 17721b8..0000000 --- a/stage9/10-iombian-shutdown-handler/00-packages +++ /dev/null @@ -1,2 +0,0 @@ -python3-venv -python3-dev \ No newline at end of file diff --git a/stage9/10-iombian-shutdown-handler/01-run.sh b/stage9/10-iombian-shutdown-handler/01-run.sh deleted file mode 100755 index 4ce126f..0000000 --- a/stage9/10-iombian-shutdown-handler/01-run.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -e - -PROJECT_NAME="iombian-shutdown-handler" -INSTALLATION_PATH="/opt/iombian-shutdown-handler" - -# Create the installation folder -on_chroot << EOF -if [ -d "$INSTALLATION_PATH" ]; then - rm -rf ${INSTALLATION_PATH} -fi -mkdir -p $INSTALLATION_PATH -EOF - -install -m 644 -g root -o root ${PROJECT_NAME}/requirements.txt ${ROOTFS_DIR}$INSTALLATION_PATH -install -m 644 -g root -o root ${PROJECT_NAME}/systemd/${PROJECT_NAME}.service ${ROOTFS_DIR}/etc/systemd/system -cp -r ${PROJECT_NAME}/src/* ${ROOTFS_DIR}$INSTALLATION_PATH - -# Create the virtual environment -on_chroot << EOF -cd $INSTALLATION_PATH -python3 -m venv venv -source venv/bin/activate -pip install --upgrade pip setuptools wheel -pip install -r requirements.txt - -chown -R $FIRST_USER_NAME:$FIRST_USER_NAME $INSTALLATION_PATH - -systemctl enable ${PROJECT_NAME} -EOF \ No newline at end of file diff --git a/stage9/10-iombian-shutdown-handler/iombian-shutdown-handler b/stage9/10-iombian-shutdown-handler/iombian-shutdown-handler deleted file mode 160000 index e587af9..0000000 --- a/stage9/10-iombian-shutdown-handler/iombian-shutdown-handler +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e587af92bd2c604ca353b9c6fcf94e15e3bcd982 diff --git a/stage9/11-iombian-button-handler/00-packages b/stage9/11-iombian-button-handler/00-packages deleted file mode 100755 index 17721b8..0000000 --- a/stage9/11-iombian-button-handler/00-packages +++ /dev/null @@ -1,2 +0,0 @@ -python3-venv -python3-dev \ No newline at end of file diff --git a/stage9/11-iombian-button-handler/01-run.sh b/stage9/11-iombian-button-handler/01-run.sh deleted file mode 100755 index 3a51f22..0000000 --- a/stage9/11-iombian-button-handler/01-run.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -e - -PROJECT_NAME="iombian-button-handler" -INSTALLATION_PATH="/opt/iombian-button-handler" - -# Create the installation folder -on_chroot << EOF -if [ -d "$INSTALLATION_PATH" ]; then - rm -rf ${INSTALLATION_PATH} -fi -mkdir -p $INSTALLATION_PATH -EOF - -install -m 644 -g root -o root ${PROJECT_NAME}/requirements.txt ${ROOTFS_DIR}$INSTALLATION_PATH -install -m 644 -g root -o root ${PROJECT_NAME}/systemd/${PROJECT_NAME}.service ${ROOTFS_DIR}/etc/systemd/system -cp -r ${PROJECT_NAME}/src/* ${ROOTFS_DIR}$INSTALLATION_PATH - -# Create the virtual environment -on_chroot << EOF -cd $INSTALLATION_PATH -python3 -m venv venv -source venv/bin/activate -pip install --upgrade pip setuptools wheel -pip install -r requirements.txt - -chown -R $FIRST_USER_NAME:$FIRST_USER_NAME $INSTALLATION_PATH - -systemctl enable ${PROJECT_NAME} -EOF \ No newline at end of file diff --git a/stage9/11-iombian-button-handler/iombian-button-handler b/stage9/11-iombian-button-handler/iombian-button-handler deleted file mode 160000 index 8ca7597..0000000 --- a/stage9/11-iombian-button-handler/iombian-button-handler +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8ca7597cb639a926b8748ee90f57c84db661d7a0 diff --git a/stage9/12-iombian-system-info-provider/00-packages b/stage9/12-iombian-system-info-provider/00-packages deleted file mode 100755 index 17721b8..0000000 --- a/stage9/12-iombian-system-info-provider/00-packages +++ /dev/null @@ -1,2 +0,0 @@ -python3-venv -python3-dev \ No newline at end of file diff --git a/stage9/12-iombian-system-info-provider/01-run.sh b/stage9/12-iombian-system-info-provider/01-run.sh deleted file mode 100755 index 6e64e27..0000000 --- a/stage9/12-iombian-system-info-provider/01-run.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -e - -PROJECT_NAME="iombian-system-info-provider" -INSTALLATION_PATH="/opt/iombian-system-info-provider" - -# Create the installation folder -on_chroot << EOF -if [ -d "$INSTALLATION_PATH" ]; then - rm -rf ${INSTALLATION_PATH} -fi -mkdir -p $INSTALLATION_PATH -EOF - -install -m 644 -g root -o root ${PROJECT_NAME}/requirements.txt ${ROOTFS_DIR}$INSTALLATION_PATH -install -m 644 -g root -o root ${PROJECT_NAME}/systemd/${PROJECT_NAME}.service ${ROOTFS_DIR}/etc/systemd/system -cp -r ${PROJECT_NAME}/src/* ${ROOTFS_DIR}$INSTALLATION_PATH - -# Create the virtual environment -on_chroot << EOF -cd $INSTALLATION_PATH -python3 -m venv venv -source venv/bin/activate -pip install --upgrade pip setuptools wheel -pip install -r requirements.txt - -chown -R $FIRST_USER_NAME:$FIRST_USER_NAME $INSTALLATION_PATH - -systemctl enable ${PROJECT_NAME} -EOF \ No newline at end of file diff --git a/stage9/12-iombian-system-info-provider/iombian-system-info-provider b/stage9/12-iombian-system-info-provider/iombian-system-info-provider deleted file mode 160000 index f018945..0000000 --- a/stage9/12-iombian-system-info-provider/iombian-system-info-provider +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f01894557d2a76056cf4759994e0c2ca19f8da8d diff --git a/stage9/17-wetty/00-packages b/stage9/17-wetty/00-packages deleted file mode 100755 index a3f82a3..0000000 --- a/stage9/17-wetty/00-packages +++ /dev/null @@ -1 +0,0 @@ -build-essential \ No newline at end of file diff --git a/stage9/17-wetty/00-run-chroot.sh b/stage9/17-wetty/00-run-chroot.sh deleted file mode 100755 index cf1ae5b..0000000 --- a/stage9/17-wetty/00-run-chroot.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -e - -INSTALLATION_PATH="/opt/wetty" - -# Create installation folder -mkdir $INSTALLATION_PATH -chown -R $FIRST_USER_NAME:$FIRST_USER_NAME $INSTALLATION_PATH - -# Install WeTTY binary file -npm install --unsafe-perm --no-progress -g wetty@2.5.0 --prefix $INSTALLATION_PATH - -# Enable systemd service -systemctl daemon-reload -systemctl enable wetty.service \ No newline at end of file diff --git a/stage9/17-wetty/00-run.sh b/stage9/17-wetty/00-run.sh deleted file mode 100755 index 214aac3..0000000 --- a/stage9/17-wetty/00-run.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -e - -install -m 644 -g root -o root files/systemd/wetty.service ${ROOTFS_DIR}/etc/systemd/system \ No newline at end of file diff --git a/stage9/17-wetty/files/systemd/wetty.service b/stage9/17-wetty/files/systemd/wetty.service deleted file mode 100644 index 705f046..0000000 --- a/stage9/17-wetty/files/systemd/wetty.service +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -Description=WeTTY -After=network-online.target - -[Service] -Type=simple -User=iompi -Restart=always -RestartSec=2 -TimeoutStopSec=5 -SyslogIdentifier=wetty - -WorkingDirectory=/opt/wetty -ExecStart=/opt/wetty/bin/wetty --host 0.0.0.0 -p 3000 --title Wetty --base / - -[Install] -WantedBy=default.target \ No newline at end of file diff --git a/stage9/18-boringproxy/00-packages b/stage9/18-boringproxy/00-packages deleted file mode 100755 index 8b258ec..0000000 --- a/stage9/18-boringproxy/00-packages +++ /dev/null @@ -1 +0,0 @@ -curl \ No newline at end of file diff --git a/stage9/18-boringproxy/00-run-chroot.sh b/stage9/18-boringproxy/00-run-chroot.sh deleted file mode 100755 index 7e51358..0000000 --- a/stage9/18-boringproxy/00-run-chroot.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -e - -BORINGPROXY_VERSION="v0.10.0" -BORINGPROXY_BINARY_NAME="boringproxy" -INSTALLATION_FOLDER="/usr/local/bin" -BORINGPROXY_BINARY_PATH=${INSTALLATION_FOLDER}/${BORINGPROXY_BINARY_NAME} - -# Download file -curl -L https://github.com/boringproxy/boringproxy/releases/download/${BORINGPROXY_VERSION}/boringproxy-linux-arm -o ${BORINGPROXY_BINARY_PATH} - -# Set permissions -chmod +x ${BORINGPROXY_BINARY_PATH} \ No newline at end of file diff --git a/stage9/19-iombian-tunnels-handler/00-packages b/stage9/19-iombian-tunnels-handler/00-packages deleted file mode 100755 index 17721b8..0000000 --- a/stage9/19-iombian-tunnels-handler/00-packages +++ /dev/null @@ -1,2 +0,0 @@ -python3-venv -python3-dev \ No newline at end of file diff --git a/stage9/19-iombian-tunnels-handler/01-run.sh b/stage9/19-iombian-tunnels-handler/01-run.sh deleted file mode 100755 index 6df5e7f..0000000 --- a/stage9/19-iombian-tunnels-handler/01-run.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -e - -PROJECT_NAME="iombian-tunnels-handler" -INSTALLATION_PATH="/opt/iombian-tunnels-handler" - -# Create the installation folder -on_chroot << EOF -if [ -d "$INSTALLATION_PATH" ]; then - rm -rf ${INSTALLATION_PATH} -fi -mkdir -p $INSTALLATION_PATH -EOF - -install -m 644 -g root -o root ${PROJECT_NAME}/requirements.txt ${ROOTFS_DIR}$INSTALLATION_PATH -install -m 644 -g root -o root ${PROJECT_NAME}/systemd/${PROJECT_NAME}.service ${ROOTFS_DIR}/etc/systemd/system -cp -r ${PROJECT_NAME}/src/* ${ROOTFS_DIR}$INSTALLATION_PATH - -# Create the virtual environment -on_chroot << EOF -cd $INSTALLATION_PATH -python3 -m venv venv -source venv/bin/activate -pip install --upgrade pip setuptools wheel -pip install -r requirements.txt - -chown -R $FIRST_USER_NAME:$FIRST_USER_NAME $INSTALLATION_PATH - -systemctl enable ${PROJECT_NAME} -EOF \ No newline at end of file diff --git a/stage9/19-iombian-tunnels-handler/02-run.sh b/stage9/19-iombian-tunnels-handler/02-run.sh deleted file mode 100755 index e9405c8..0000000 --- a/stage9/19-iombian-tunnels-handler/02-run.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -e - -# Ensure that time synchronization services start on boot -on_chroot << EOF -systemctl enable systemd-timesyncd.service -systemctl enable systemd-time-wait-sync.service -EOF \ No newline at end of file diff --git a/stage9/19-iombian-tunnels-handler/iombian-tunnels-handler b/stage9/19-iombian-tunnels-handler/iombian-tunnels-handler deleted file mode 160000 index 65ecbc0..0000000 --- a/stage9/19-iombian-tunnels-handler/iombian-tunnels-handler +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 65ecbc07ff0b2d7ef6cedd93fff1cd83fa0262d5 diff --git a/stage9/20-iombian-services-uploader/00-packages b/stage9/20-iombian-services-uploader/00-packages deleted file mode 100755 index 17721b8..0000000 --- a/stage9/20-iombian-services-uploader/00-packages +++ /dev/null @@ -1,2 +0,0 @@ -python3-venv -python3-dev \ No newline at end of file diff --git a/stage9/20-iombian-services-uploader/01-run.sh b/stage9/20-iombian-services-uploader/01-run.sh deleted file mode 100755 index ee3810d..0000000 --- a/stage9/20-iombian-services-uploader/01-run.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -e - -PROJECT_NAME="iombian-services-uploader" -INSTALLATION_PATH="/opt/iombian-services-uploader" - -# Create the installation folder -on_chroot << EOF -if [ -d "$INSTALLATION_PATH" ]; then - rm -rf ${INSTALLATION_PATH} -fi -mkdir -p $INSTALLATION_PATH -EOF - -install -m 644 -g root -o root ${PROJECT_NAME}/requirements.txt ${ROOTFS_DIR}$INSTALLATION_PATH -install -m 644 -g root -o root ${PROJECT_NAME}/systemd/${PROJECT_NAME}.service ${ROOTFS_DIR}/etc/systemd/system -cp -r ${PROJECT_NAME}/src/* ${ROOTFS_DIR}$INSTALLATION_PATH - -# Create the virtual environment -on_chroot << EOF -cd $INSTALLATION_PATH -python3 -m venv venv -source venv/bin/activate -pip install --upgrade pip setuptools wheel -pip install -r requirements.txt - -chown -R $FIRST_USER_NAME:$FIRST_USER_NAME $INSTALLATION_PATH - -systemctl enable ${PROJECT_NAME} -EOF \ No newline at end of file diff --git a/stage9/20-iombian-services-uploader/02-run.sh b/stage9/20-iombian-services-uploader/02-run.sh deleted file mode 100755 index e9405c8..0000000 --- a/stage9/20-iombian-services-uploader/02-run.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -e - -# Ensure that time synchronization services start on boot -on_chroot << EOF -systemctl enable systemd-timesyncd.service -systemctl enable systemd-time-wait-sync.service -EOF \ No newline at end of file diff --git a/stage9/20-iombian-services-uploader/iombian-services-uploader b/stage9/20-iombian-services-uploader/iombian-services-uploader deleted file mode 160000 index b2ab718..0000000 --- a/stage9/20-iombian-services-uploader/iombian-services-uploader +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b2ab7184f54730f8be17d42f62d43856259b208e diff --git a/stage9/21-iombian-system-info-uploader/00-packages b/stage9/21-iombian-system-info-uploader/00-packages deleted file mode 100755 index 17721b8..0000000 --- a/stage9/21-iombian-system-info-uploader/00-packages +++ /dev/null @@ -1,2 +0,0 @@ -python3-venv -python3-dev \ No newline at end of file diff --git a/stage9/21-iombian-system-info-uploader/01-run.sh b/stage9/21-iombian-system-info-uploader/01-run.sh deleted file mode 100755 index a793165..0000000 --- a/stage9/21-iombian-system-info-uploader/01-run.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -e - -PROJECT_NAME="iombian-system-info-uploader" -INSTALLATION_PATH="/opt/iombian-system-info-uploader" - -# Create the installation folder -on_chroot << EOF -if [ -d "$INSTALLATION_PATH" ]; then - rm -rf ${INSTALLATION_PATH} -fi -mkdir -p $INSTALLATION_PATH -EOF - -install -m 644 -g root -o root ${PROJECT_NAME}/requirements.txt ${ROOTFS_DIR}$INSTALLATION_PATH -install -m 644 -g root -o root ${PROJECT_NAME}/systemd/${PROJECT_NAME}.service ${ROOTFS_DIR}/etc/systemd/system -cp -r ${PROJECT_NAME}/src/* ${ROOTFS_DIR}$INSTALLATION_PATH - -# Create the virtual environment -on_chroot << EOF -cd $INSTALLATION_PATH -python3 -m venv venv -source venv/bin/activate -pip install --upgrade pip setuptools wheel -pip install -r requirements.txt - -chown -R $FIRST_USER_NAME:$FIRST_USER_NAME $INSTALLATION_PATH - -systemctl enable ${PROJECT_NAME} -EOF \ No newline at end of file diff --git a/stage9/21-iombian-system-info-uploader/02-run.sh b/stage9/21-iombian-system-info-uploader/02-run.sh deleted file mode 100755 index e9405c8..0000000 --- a/stage9/21-iombian-system-info-uploader/02-run.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -e - -# Ensure that time synchronization services start on boot -on_chroot << EOF -systemctl enable systemd-timesyncd.service -systemctl enable systemd-time-wait-sync.service -EOF \ No newline at end of file diff --git a/stage9/21-iombian-system-info-uploader/iombian-system-info-uploader b/stage9/21-iombian-system-info-uploader/iombian-system-info-uploader deleted file mode 160000 index 22b4081..0000000 --- a/stage9/21-iombian-system-info-uploader/iombian-system-info-uploader +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 22b4081b7ca1d7b31bf59311f93f9f73dc9b727b From 9a6a417129b96fddadeb05fbb996491e32ba2263 Mon Sep 17 00:00:00 2001 From: Aitor Iturrioz Date: Mon, 13 May 2024 13:23:22 +0200 Subject: [PATCH 02/30] Add Docker installation steps Signed-off-by: Aitor Iturrioz --- stage9/02-docker/00-run-chroot.sh | 20 ++++++++++++++++++++ stage9/02-docker/01-run-chroot.sh | 7 +++++++ stage9/02-docker/02-run-chroot.sh | 9 +++++++++ 3 files changed, 36 insertions(+) create mode 100644 stage9/02-docker/00-run-chroot.sh create mode 100644 stage9/02-docker/01-run-chroot.sh create mode 100644 stage9/02-docker/02-run-chroot.sh diff --git a/stage9/02-docker/00-run-chroot.sh b/stage9/02-docker/00-run-chroot.sh new file mode 100644 index 0000000..ca97960 --- /dev/null +++ b/stage9/02-docker/00-run-chroot.sh @@ -0,0 +1,20 @@ +#!/bin/bash -e + +# Uninstall all conflicting packages +for pkg in docker.io docker-doc docker-compose podman-docker containerd runc; do apt-get remove $pkg; done + +# Set up Docker's apt repository +apt-get update +apt-get install ca-certificates curl +install -m 0755 -d /etc/apt/keyrings +curl -fsSL https://download.docker.com/linux/raspbian/gpg -o /etc/apt/keyrings/docker.asc +chmod a+r /etc/apt/keyrings/docker.asc + +echo \ + "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/raspbian \ + $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \ + tee /etc/apt/sources.list.d/docker.list > /dev/null +apt-get update + +# Install the Docker packages +apt-get install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin \ No newline at end of file diff --git a/stage9/02-docker/01-run-chroot.sh b/stage9/02-docker/01-run-chroot.sh new file mode 100644 index 0000000..99edca3 --- /dev/null +++ b/stage9/02-docker/01-run-chroot.sh @@ -0,0 +1,7 @@ +#!/bin/bash -e + +# Create the docker group and add the user +groupadd docker + +# Add the user to the docker group +usermod -aG docker $FIRST_USER_NAME \ No newline at end of file diff --git a/stage9/02-docker/02-run-chroot.sh b/stage9/02-docker/02-run-chroot.sh new file mode 100644 index 0000000..85785c7 --- /dev/null +++ b/stage9/02-docker/02-run-chroot.sh @@ -0,0 +1,9 @@ +#!/bin/bash -e + +echo '{ + "log-driver": "json-file", + "log-opts": { + "max-size": "10m", + "max-file": "3" + } +}' >> /etc/docker/daemon.json \ No newline at end of file From 0d29d314b12ccec55fdcffba9e16350380ed3b7e Mon Sep 17 00:00:00 2001 From: Aitor Iturrioz Date: Mon, 13 May 2024 13:24:44 +0200 Subject: [PATCH 03/30] Add Docker networks creation steps Signed-off-by: Aitor Iturrioz --- stage9/03-docker-networks/00-run-chroot.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 stage9/03-docker-networks/00-run-chroot.sh diff --git a/stage9/03-docker-networks/00-run-chroot.sh b/stage9/03-docker-networks/00-run-chroot.sh new file mode 100644 index 0000000..3b33def --- /dev/null +++ b/stage9/03-docker-networks/00-run-chroot.sh @@ -0,0 +1,10 @@ +#!/bin/bash -e + +DOCKER_INTERNAL_NETWORK_NAME=iombian-internal-services +DOCKER_EXTERNAL_NETWORK_NAME=iombian-external-services + +# Install internal network +docker network create ${DOCKER_INTERNAL_NETWORK_NAME} + +# Install external network +docker network create ${DOCKER_EXTERNAL_NETWORK_NAME} \ No newline at end of file From 7aa1dcde4c674732f0f6e52dd461d0e07ebb7bec Mon Sep 17 00:00:00 2001 From: Aitor Iturrioz Date: Mon, 13 May 2024 13:25:07 +0200 Subject: [PATCH 04/30] Add Docker services folder creation steps Signed-off-by: Aitor Iturrioz --- stage9/10-services-folder/00-run-chroot.sh | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 stage9/10-services-folder/00-run-chroot.sh diff --git a/stage9/10-services-folder/00-run-chroot.sh b/stage9/10-services-folder/00-run-chroot.sh new file mode 100644 index 0000000..f373408 --- /dev/null +++ b/stage9/10-services-folder/00-run-chroot.sh @@ -0,0 +1,9 @@ +#!/bin/bash -e + +SERVICES_FOLDER_PATH="/opt/iombian-services" + +# Create the services folder +mkdir -p $SERVICES_FOLDER_PATH + +# Asign correct ownership to the services folder +chown -R $FIRST_USER_NAME:$FIRST_USER_NAME $SERVICES_FOLDER_PATH \ No newline at end of file From 5eb3f21a2bac80c61db7f2918217957029e1b56d Mon Sep 17 00:00:00 2001 From: Aitor Iturrioz Date: Mon, 13 May 2024 13:26:42 +0200 Subject: [PATCH 05/30] Refactor iombian-config-file-handler installation steps (with Docker) Signed-off-by: Aitor Iturrioz --- .../00-packages | 2 -- .../02-iombian-config-file-handler/01-run.sh | 29 ------------------- .../00-run-chroot.sh | 17 +++++++++++ .../11-iombian-config-file-handler/01-run.sh | 7 +++++ .../env-vars/.env | 4 +++ 5 files changed, 28 insertions(+), 31 deletions(-) delete mode 100755 stage9/02-iombian-config-file-handler/00-packages delete mode 100755 stage9/02-iombian-config-file-handler/01-run.sh create mode 100644 stage9/11-iombian-config-file-handler/00-run-chroot.sh create mode 100644 stage9/11-iombian-config-file-handler/01-run.sh create mode 100644 stage9/11-iombian-config-file-handler/env-vars/.env diff --git a/stage9/02-iombian-config-file-handler/00-packages b/stage9/02-iombian-config-file-handler/00-packages deleted file mode 100755 index 17721b8..0000000 --- a/stage9/02-iombian-config-file-handler/00-packages +++ /dev/null @@ -1,2 +0,0 @@ -python3-venv -python3-dev \ No newline at end of file diff --git a/stage9/02-iombian-config-file-handler/01-run.sh b/stage9/02-iombian-config-file-handler/01-run.sh deleted file mode 100755 index 9666753..0000000 --- a/stage9/02-iombian-config-file-handler/01-run.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -e - -PROJECT_NAME="iombian-config-file-handler" -INSTALLATION_PATH="/opt/iombian-config-file-handler" - -# Create the installation folder -on_chroot << EOF -if [ -d "$INSTALLATION_PATH" ]; then - rm -rf ${INSTALLATION_PATH} -fi -mkdir -p $INSTALLATION_PATH -EOF - -install -m 644 -g root -o root ${PROJECT_NAME}/requirements.txt ${ROOTFS_DIR}$INSTALLATION_PATH -install -m 644 -g root -o root ${PROJECT_NAME}/systemd/${PROJECT_NAME}.service ${ROOTFS_DIR}/etc/systemd/system -cp -r ${PROJECT_NAME}/src/* ${ROOTFS_DIR}$INSTALLATION_PATH - -# Create the virtual environment -on_chroot << EOF -cd $INSTALLATION_PATH -python3 -m venv venv -source venv/bin/activate -pip install --upgrade pip setuptools wheel -pip install -r requirements.txt - -chown -R $FIRST_USER_NAME:$FIRST_USER_NAME $INSTALLATION_PATH - -systemctl enable ${PROJECT_NAME} -EOF \ No newline at end of file diff --git a/stage9/11-iombian-config-file-handler/00-run-chroot.sh b/stage9/11-iombian-config-file-handler/00-run-chroot.sh new file mode 100644 index 0000000..5a1dd72 --- /dev/null +++ b/stage9/11-iombian-config-file-handler/00-run-chroot.sh @@ -0,0 +1,17 @@ +#!/bin/bash -e + +SERVICES_FOLDER_PATH="/opt/iombian-services" +SERVICE_NAME="iombian-config-file-handler" +SERVICE_VERSION="0.1.0" + +# Create service folder +mkdir -p ${SERVICES_FOLDER_PATH}/${SERVICE_NAME} + +# Download service file locally +wget https://raw.githubusercontent.com/Tknika/iombian-services-marketplace/main/services/${SERVICE_NAME}/${SERVICE_VERSION}/docker-compose.yaml -P ${SERVICES_FOLDER_PATH}/${SERVICE_NAME} + +# Asign correct ownership to the folder +chown -R ${FIRST_USER_NAME}:${FIRST_USER_NAME} ${SERVICES_FOLDER_PATH}/${SERVICE_NAME} + +# Pull docker image +docker compose pull -f ${SERVICES_FOLDER_PATH}/${SERVICE_NAME}/docker-compose.yaml \ No newline at end of file diff --git a/stage9/11-iombian-config-file-handler/01-run.sh b/stage9/11-iombian-config-file-handler/01-run.sh new file mode 100644 index 0000000..fd3f966 --- /dev/null +++ b/stage9/11-iombian-config-file-handler/01-run.sh @@ -0,0 +1,7 @@ +#!/bin/bash -e + +SERVICES_FOLDER_PATH="/opt/iombian-services" +SERVICE_NAME="iombian-config-file-handler" + +# Copy .env file to service folder +install -m 644 -g ${FIRST_USER_NAME} -o ${FIRST_USER_NAME} env-vars/.env ${ROOTFS_DIR}${SERVICES_FOLDER_PATH}/${SERVICE_NAME}/.env \ No newline at end of file diff --git a/stage9/11-iombian-config-file-handler/env-vars/.env b/stage9/11-iombian-config-file-handler/env-vars/.env new file mode 100644 index 0000000..e8b0eb6 --- /dev/null +++ b/stage9/11-iombian-config-file-handler/env-vars/.env @@ -0,0 +1,4 @@ +RESET_EVENT=long_long_click +BUTTON_EVENTS_PORT=5556 +SHUTDOWN_SERVICE_PORT=5558 +LOG_LEVEL=INFO \ No newline at end of file From 5e6f190816ae2881fa0257ca05814964736dd0de Mon Sep 17 00:00:00 2001 From: Aitor Iturrioz Date: Mon, 13 May 2024 13:28:54 +0200 Subject: [PATCH 06/30] Move iombian-bluetooth-configurator files to new folder Signed-off-by: Aitor Iturrioz --- .../00-packages | 0 .../01-run.sh | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename stage9/{14-iombian-bluetooth-configurator => 12-iombian-bluetooth-configurator}/00-packages (100%) rename stage9/{14-iombian-bluetooth-configurator => 12-iombian-bluetooth-configurator}/01-run.sh (100%) diff --git a/stage9/14-iombian-bluetooth-configurator/00-packages b/stage9/12-iombian-bluetooth-configurator/00-packages similarity index 100% rename from stage9/14-iombian-bluetooth-configurator/00-packages rename to stage9/12-iombian-bluetooth-configurator/00-packages diff --git a/stage9/14-iombian-bluetooth-configurator/01-run.sh b/stage9/12-iombian-bluetooth-configurator/01-run.sh similarity index 100% rename from stage9/14-iombian-bluetooth-configurator/01-run.sh rename to stage9/12-iombian-bluetooth-configurator/01-run.sh From 75544b3a235dee8e51dc0f1f5e915b0f2f490d02 Mon Sep 17 00:00:00 2001 From: Aitor Iturrioz Date: Mon, 13 May 2024 13:30:06 +0200 Subject: [PATCH 07/30] Move iombian-serial-configurator files to new folder Signed-off-by: Aitor Iturrioz --- .../00-packages | 0 .../01-run.sh | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename stage9/{16-iombian-serial-configurator => 13-iombian-serial-configurator}/00-packages (100%) rename stage9/{16-iombian-serial-configurator => 13-iombian-serial-configurator}/01-run.sh (100%) diff --git a/stage9/16-iombian-serial-configurator/00-packages b/stage9/13-iombian-serial-configurator/00-packages similarity index 100% rename from stage9/16-iombian-serial-configurator/00-packages rename to stage9/13-iombian-serial-configurator/00-packages diff --git a/stage9/16-iombian-serial-configurator/01-run.sh b/stage9/13-iombian-serial-configurator/01-run.sh similarity index 100% rename from stage9/16-iombian-serial-configurator/01-run.sh rename to stage9/13-iombian-serial-configurator/01-run.sh From d803135d07c6365ef67e4ced0444f336fd041d59 Mon Sep 17 00:00:00 2001 From: Aitor Iturrioz Date: Mon, 13 May 2024 13:31:19 +0200 Subject: [PATCH 08/30] Move iombian-remote-configurator-files to new folder Signed-off-by: Aitor Iturrioz --- .../00-packages | 0 .../01-run.sh | 0 .../02-run.sh | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename stage9/{15-iombian-remote-configurator => 14-iombian-remote-configurator}/00-packages (100%) rename stage9/{15-iombian-remote-configurator => 14-iombian-remote-configurator}/01-run.sh (100%) rename stage9/{15-iombian-remote-configurator => 14-iombian-remote-configurator}/02-run.sh (100%) diff --git a/stage9/15-iombian-remote-configurator/00-packages b/stage9/14-iombian-remote-configurator/00-packages similarity index 100% rename from stage9/15-iombian-remote-configurator/00-packages rename to stage9/14-iombian-remote-configurator/00-packages diff --git a/stage9/15-iombian-remote-configurator/01-run.sh b/stage9/14-iombian-remote-configurator/01-run.sh similarity index 100% rename from stage9/15-iombian-remote-configurator/01-run.sh rename to stage9/14-iombian-remote-configurator/01-run.sh diff --git a/stage9/15-iombian-remote-configurator/02-run.sh b/stage9/14-iombian-remote-configurator/02-run.sh similarity index 100% rename from stage9/15-iombian-remote-configurator/02-run.sh rename to stage9/14-iombian-remote-configurator/02-run.sh From 0d914317c1bc90d38e70aabc5acfac85621e1382 Mon Sep 17 00:00:00 2001 From: Aitor Iturrioz Date: Mon, 13 May 2024 13:32:12 +0200 Subject: [PATCH 09/30] Move iombian-display-handler files to new folder Signed-off-by: Aitor Iturrioz --- .../00-packages | 0 .../01-run.sh | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename stage9/{13-iombian-display-handler => 19-iombian-display-handler}/00-packages (100%) rename stage9/{13-iombian-display-handler => 19-iombian-display-handler}/01-run.sh (100%) diff --git a/stage9/13-iombian-display-handler/00-packages b/stage9/19-iombian-display-handler/00-packages similarity index 100% rename from stage9/13-iombian-display-handler/00-packages rename to stage9/19-iombian-display-handler/00-packages diff --git a/stage9/13-iombian-display-handler/01-run.sh b/stage9/19-iombian-display-handler/01-run.sh similarity index 100% rename from stage9/13-iombian-display-handler/01-run.sh rename to stage9/19-iombian-display-handler/01-run.sh From 3707476e56562a437460ac96590135857cced24f Mon Sep 17 00:00:00 2001 From: Aitor Iturrioz Date: Mon, 13 May 2024 13:32:38 +0200 Subject: [PATCH 10/30] Update confinit files Signed-off-by: Aitor Iturrioz --- stage9/99-confinit/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stage9/99-confinit/config b/stage9/99-confinit/config index 535834a..15f8a2e 160000 --- a/stage9/99-confinit/config +++ b/stage9/99-confinit/config @@ -1 +1 @@ -Subproject commit 535834ae4ce183a1e4c7b06300bf8ccd2a835061 +Subproject commit 15f8a2e065cdb51a1c06513108a8b40d4835c4bd From d60c4300216a944287c2b2721d9198058fe40bf8 Mon Sep 17 00:00:00 2001 From: Aitor Iturrioz Date: Mon, 13 May 2024 13:34:40 +0200 Subject: [PATCH 11/30] Remove git submodules for the services Signed-off-by: Aitor Iturrioz --- .../02-iombian-config-file-handler/iombian-config-file-handler | 1 - stage9/13-iombian-display-handler/iombian-display-handler | 1 - .../iombian-bluetooth-configurator | 1 - .../15-iombian-remote-configurator/iombian-remote-configurator | 1 - .../16-iombian-serial-configurator/iombian-serial-configurator | 1 - 5 files changed, 5 deletions(-) delete mode 160000 stage9/02-iombian-config-file-handler/iombian-config-file-handler delete mode 160000 stage9/13-iombian-display-handler/iombian-display-handler delete mode 160000 stage9/14-iombian-bluetooth-configurator/iombian-bluetooth-configurator delete mode 160000 stage9/15-iombian-remote-configurator/iombian-remote-configurator delete mode 160000 stage9/16-iombian-serial-configurator/iombian-serial-configurator diff --git a/stage9/02-iombian-config-file-handler/iombian-config-file-handler b/stage9/02-iombian-config-file-handler/iombian-config-file-handler deleted file mode 160000 index 3ec1037..0000000 --- a/stage9/02-iombian-config-file-handler/iombian-config-file-handler +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3ec103726442b4115bb9d9190aac3437d81b8c94 diff --git a/stage9/13-iombian-display-handler/iombian-display-handler b/stage9/13-iombian-display-handler/iombian-display-handler deleted file mode 160000 index dde14e9..0000000 --- a/stage9/13-iombian-display-handler/iombian-display-handler +++ /dev/null @@ -1 +0,0 @@ -Subproject commit dde14e9ec06d675502d0f0d46d78a53bfa51fde1 diff --git a/stage9/14-iombian-bluetooth-configurator/iombian-bluetooth-configurator b/stage9/14-iombian-bluetooth-configurator/iombian-bluetooth-configurator deleted file mode 160000 index 7a4be6f..0000000 --- a/stage9/14-iombian-bluetooth-configurator/iombian-bluetooth-configurator +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7a4be6f632fe18a86d1c68b342aaf4c413748b34 diff --git a/stage9/15-iombian-remote-configurator/iombian-remote-configurator b/stage9/15-iombian-remote-configurator/iombian-remote-configurator deleted file mode 160000 index 3212f79..0000000 --- a/stage9/15-iombian-remote-configurator/iombian-remote-configurator +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3212f795a7c4bfa2fc2e6c57e27e56ff8a344f09 diff --git a/stage9/16-iombian-serial-configurator/iombian-serial-configurator b/stage9/16-iombian-serial-configurator/iombian-serial-configurator deleted file mode 160000 index 287b5d7..0000000 --- a/stage9/16-iombian-serial-configurator/iombian-serial-configurator +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 287b5d75ef35b27d79134239f465f29f6cc59490 From b6a4c8526abef1d315c9c632facc5fcc25151fb3 Mon Sep 17 00:00:00 2001 From: Aitor Iturrioz Date: Mon, 13 May 2024 14:35:21 +0200 Subject: [PATCH 12/30] Do not try to uninstall non-installed packages for Docker installation Signed-off-by: Aitor Iturrioz --- stage9/02-docker/00-run-chroot.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/stage9/02-docker/00-run-chroot.sh b/stage9/02-docker/00-run-chroot.sh index ca97960..6d38df4 100644 --- a/stage9/02-docker/00-run-chroot.sh +++ b/stage9/02-docker/00-run-chroot.sh @@ -1,7 +1,13 @@ #!/bin/bash -e # Uninstall all conflicting packages -for pkg in docker.io docker-doc docker-compose podman-docker containerd runc; do apt-get remove $pkg; done +for pkg in docker.io docker-doc docker-compose podman-docker containerd runc; +do + $(dpkg --status $pkg &> /dev/null) + if [[ $? -eq 0 ]]; then + apt-get remove $pkg; + fi +done # Set up Docker's apt repository apt-get update From 243ba6f0c18e0c5c43ddec8451369117bef98e8f Mon Sep 17 00:00:00 2001 From: Aitor Iturrioz Date: Mon, 13 May 2024 17:10:05 +0200 Subject: [PATCH 13/30] Remove unnecessary podman-docker package from uninstall loop Signed-off-by: Aitor Iturrioz --- stage9/02-docker/00-run-chroot.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stage9/02-docker/00-run-chroot.sh b/stage9/02-docker/00-run-chroot.sh index 6d38df4..f66c122 100644 --- a/stage9/02-docker/00-run-chroot.sh +++ b/stage9/02-docker/00-run-chroot.sh @@ -1,7 +1,7 @@ #!/bin/bash -e # Uninstall all conflicting packages -for pkg in docker.io docker-doc docker-compose podman-docker containerd runc; +for pkg in docker.io docker-doc docker-compose containerd runc; do $(dpkg --status $pkg &> /dev/null) if [[ $? -eq 0 ]]; then From 4736ae27af8f861d7edb6ab218dfac2cb32d0950 Mon Sep 17 00:00:00 2001 From: Aitor Iturrioz Date: Mon, 13 May 2024 20:18:07 +0200 Subject: [PATCH 14/30] Remove installed packages check for Docker installation Signed-off-by: Aitor Iturrioz --- stage9/02-docker/00-run-chroot.sh | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/stage9/02-docker/00-run-chroot.sh b/stage9/02-docker/00-run-chroot.sh index f66c122..caba5be 100644 --- a/stage9/02-docker/00-run-chroot.sh +++ b/stage9/02-docker/00-run-chroot.sh @@ -1,13 +1,7 @@ #!/bin/bash -e # Uninstall all conflicting packages -for pkg in docker.io docker-doc docker-compose containerd runc; -do - $(dpkg --status $pkg &> /dev/null) - if [[ $? -eq 0 ]]; then - apt-get remove $pkg; - fi -done +for pkg in docker.io docker-doc docker-compose containerd runc; do apt-get remove $pkg; done # Set up Docker's apt repository apt-get update From 96b6f4ebadd884a23be3e706fcb76aa36d8d71fd Mon Sep 17 00:00:00 2001 From: Aitor Iturrioz Date: Mon, 13 May 2024 21:28:38 +0200 Subject: [PATCH 15/30] Do not fail if docker group already exists Signed-off-by: Aitor Iturrioz --- stage9/02-docker/01-run-chroot.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stage9/02-docker/01-run-chroot.sh b/stage9/02-docker/01-run-chroot.sh index 99edca3..acadc55 100644 --- a/stage9/02-docker/01-run-chroot.sh +++ b/stage9/02-docker/01-run-chroot.sh @@ -1,7 +1,7 @@ #!/bin/bash -e -# Create the docker group and add the user -groupadd docker +# Create the docker group +groupadd -f docker # Add the user to the docker group usermod -aG docker $FIRST_USER_NAME \ No newline at end of file From 7fadfde5b66ed25ec9d623dd1d53d2b2b01a6d54 Mon Sep 17 00:00:00 2001 From: Aitor Iturrioz Date: Mon, 13 May 2024 22:28:53 +0200 Subject: [PATCH 16/30] Temporally disable docker network creation Signed-off-by: Aitor Iturrioz --- stage9/03-docker-networks/00-run-chroot.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stage9/03-docker-networks/00-run-chroot.sh b/stage9/03-docker-networks/00-run-chroot.sh index 3b33def..8f7fe4b 100644 --- a/stage9/03-docker-networks/00-run-chroot.sh +++ b/stage9/03-docker-networks/00-run-chroot.sh @@ -4,7 +4,7 @@ DOCKER_INTERNAL_NETWORK_NAME=iombian-internal-services DOCKER_EXTERNAL_NETWORK_NAME=iombian-external-services # Install internal network -docker network create ${DOCKER_INTERNAL_NETWORK_NAME} +#docker network create ${DOCKER_INTERNAL_NETWORK_NAME} # Install external network -docker network create ${DOCKER_EXTERNAL_NETWORK_NAME} \ No newline at end of file +#docker network create ${DOCKER_EXTERNAL_NETWORK_NAME} \ No newline at end of file From d3a63936c1c45f5dc6d455ac3fa1cd0773305f5f Mon Sep 17 00:00:00 2001 From: Aitor Iturrioz Date: Mon, 13 May 2024 23:29:41 +0200 Subject: [PATCH 17/30] Fix "docker compose pull" parameters order Signed-off-by: Aitor Iturrioz --- stage9/11-iombian-config-file-handler/00-run-chroot.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stage9/11-iombian-config-file-handler/00-run-chroot.sh b/stage9/11-iombian-config-file-handler/00-run-chroot.sh index 5a1dd72..4ff75ea 100644 --- a/stage9/11-iombian-config-file-handler/00-run-chroot.sh +++ b/stage9/11-iombian-config-file-handler/00-run-chroot.sh @@ -14,4 +14,4 @@ wget https://raw.githubusercontent.com/Tknika/iombian-services-marketplace/main/ chown -R ${FIRST_USER_NAME}:${FIRST_USER_NAME} ${SERVICES_FOLDER_PATH}/${SERVICE_NAME} # Pull docker image -docker compose pull -f ${SERVICES_FOLDER_PATH}/${SERVICE_NAME}/docker-compose.yaml \ No newline at end of file +docker compose -f ${SERVICES_FOLDER_PATH}/${SERVICE_NAME}/docker-compose.yaml pull \ No newline at end of file From c0bbcfe67fe5350fffa871004270747e6b1aa74f Mon Sep 17 00:00:00 2001 From: Aitor Iturrioz Date: Mon, 10 Jun 2024 12:13:29 +0200 Subject: [PATCH 18/30] Refactor all submodules Signed-off-by: Aitor Iturrioz --- .gitmodules | 51 ++++++++----------- .../iombian-config-file-handler | 1 + .../iombian-bluetooth-configurator | 1 + .../iombian-serial-configurator | 1 + .../iombian-remote-configurator | 1 + .../iombian-installed-services-handler | 1 + .../iombian-installed-services-downloader | 1 + .../iombian-updatable-services-handler | 1 + .../iombian-display-handler | 1 + 9 files changed, 29 insertions(+), 30 deletions(-) create mode 160000 stage9/11-iombian-config-file-handler/iombian-config-file-handler create mode 160000 stage9/12-iombian-bluetooth-configurator/iombian-bluetooth-configurator create mode 160000 stage9/13-iombian-serial-configurator/iombian-serial-configurator create mode 160000 stage9/14-iombian-remote-configurator/iombian-remote-configurator create mode 160000 stage9/15-iombian-installed-services-handler/iombian-installed-services-handler create mode 160000 stage9/16-iombian-installed-services-downloader/iombian-installed-services-downloader create mode 160000 stage9/17-iombian-updatable-services-handler/iombian-updatable-services-handler create mode 160000 stage9/19-iombian-display-handler/iombian-display-handler diff --git a/.gitmodules b/.gitmodules index ed1c392..e5216e3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,36 +4,27 @@ [submodule "stage9/99-confinit/config"] path = stage9/99-confinit/config url = https://github.com/Tknika/iombian-confinit.git -[submodule "stage9/02-iombian-config-file-handler/iombian-config-file-handler"] - path = stage9/02-iombian-config-file-handler/iombian-config-file-handler +[submodule "stage9/11-iombian-config-file-handler/iombian-config-file-handler"] + path = stage9/11-iombian-config-file-handler/iombian-config-file-handler url = https://github.com/Tknika/iombian-config-file-handler.git -[submodule "stage9/10-iombian-shutdown-handler/iombian-shutdown-handler"] - path = stage9/10-iombian-shutdown-handler/iombian-shutdown-handler - url = https://github.com/Tknika/iombian-shutdown-handler.git -[submodule "stage9/11-iombian-button-handler/iombian-button-handler"] - path = stage9/11-iombian-button-handler/iombian-button-handler - url = https://github.com/Tknika/iombian-button-handler.git -[submodule "stage9/12-iombian-system-info-provider/iombian-system-info-provider"] - path = stage9/12-iombian-system-info-provider/iombian-system-info-provider - url = https://github.com/Tknika/iombian-system-info-provider.git -[submodule "stage9/13-iombian-display-handler/iombian-display-handler"] - path = stage9/13-iombian-display-handler/iombian-display-handler - url = https://github.com/Tknika/iombian-display-handler.git -[submodule "stage9/14-iombian-bluetooth-configurator/iombian-bluetooth-configurator"] - path = stage9/14-iombian-bluetooth-configurator/iombian-bluetooth-configurator +[submodule "stage9/12-iombian-bluetooth-configurator/iombian-bluetooth-configurator"] + path = stage9/12-iombian-bluetooth-configurator/iombian-bluetooth-configurator url = https://github.com/Tknika/iombian-bluetooth-configurator.git -[submodule "stage9/15-iombian-remote-configurator/iombian-remote-configurator"] - path = stage9/15-iombian-remote-configurator/iombian-remote-configurator - url = https://github.com/Tknika/iombian-remote-configurator.git -[submodule "stage9/16-iombian-serial-configurator/iombian-serial-configurator"] - path = stage9/16-iombian-serial-configurator/iombian-serial-configurator +[submodule "stage9/13-iombian-serial-configurator/iombian-serial-configurator"] + path = stage9/13-iombian-serial-configurator/iombian-serial-configurator url = https://github.com/Tknika/iombian-serial-configurator.git -[submodule "stage9/19-iombian-tunnels-handler/iombian-tunnels-handler"] - path = stage9/19-iombian-tunnels-handler/iombian-tunnels-handler - url = https://github.com/Tknika/iombian-tunnels-handler.git -[submodule "stage9/20-iombian-services-uploader/iombian-services-uploader"] - path = stage9/20-iombian-services-uploader/iombian-services-uploader - url = https://github.com/Tknika/iombian-services-uploader.git -[submodule "stage9/21-iombian-system-info-uploader/iombian-system-info-uploader"] - path = stage9/21-iombian-system-info-uploader/iombian-system-info-uploader - url = https://github.com/Tknika/iombian-system-info-uploader.git +[submodule "stage9/14-iombian-remote-configurator/iombian-remote-configurator"] + path = stage9/14-iombian-remote-configurator/iombian-remote-configurator + url = https://github.com/Tknika/iombian-remote-configurator.git +[submodule "stage9/16-iombian-installed-services-downloader/iombian-installed-services-downloader"] + path = stage9/16-iombian-installed-services-downloader/iombian-installed-services-downloader + url = https://github.com/Tknika/iombian-installed-services-downloader.git +[submodule "stage9/15-iombian-installed-services-handler/iombian-installed-services-handler"] + path = stage9/15-iombian-installed-services-handler/iombian-installed-services-handler + url = https://github.com/Tknika/iombian-installed-services-handler.git +[submodule "stage9/17-iombian-updatable-services-handler/iombian-updatable-services-handler"] + path = stage9/17-iombian-updatable-services-handler/iombian-updatable-services-handler + url = https://github.com/Tknika/iombian-updatable-services-handler.git +[submodule "stage9/19-iombian-display-handler/iombian-display-handler"] + path = stage9/19-iombian-display-handler/iombian-display-handler + url = https://github.com/Tknika/iombian-display-handler.git diff --git a/stage9/11-iombian-config-file-handler/iombian-config-file-handler b/stage9/11-iombian-config-file-handler/iombian-config-file-handler new file mode 160000 index 0000000..32a63d3 --- /dev/null +++ b/stage9/11-iombian-config-file-handler/iombian-config-file-handler @@ -0,0 +1 @@ +Subproject commit 32a63d3423c4f1978605eddf34eafd7f54b2ee9f diff --git a/stage9/12-iombian-bluetooth-configurator/iombian-bluetooth-configurator b/stage9/12-iombian-bluetooth-configurator/iombian-bluetooth-configurator new file mode 160000 index 0000000..7a4be6f --- /dev/null +++ b/stage9/12-iombian-bluetooth-configurator/iombian-bluetooth-configurator @@ -0,0 +1 @@ +Subproject commit 7a4be6f632fe18a86d1c68b342aaf4c413748b34 diff --git a/stage9/13-iombian-serial-configurator/iombian-serial-configurator b/stage9/13-iombian-serial-configurator/iombian-serial-configurator new file mode 160000 index 0000000..287b5d7 --- /dev/null +++ b/stage9/13-iombian-serial-configurator/iombian-serial-configurator @@ -0,0 +1 @@ +Subproject commit 287b5d75ef35b27d79134239f465f29f6cc59490 diff --git a/stage9/14-iombian-remote-configurator/iombian-remote-configurator b/stage9/14-iombian-remote-configurator/iombian-remote-configurator new file mode 160000 index 0000000..3212f79 --- /dev/null +++ b/stage9/14-iombian-remote-configurator/iombian-remote-configurator @@ -0,0 +1 @@ +Subproject commit 3212f795a7c4bfa2fc2e6c57e27e56ff8a344f09 diff --git a/stage9/15-iombian-installed-services-handler/iombian-installed-services-handler b/stage9/15-iombian-installed-services-handler/iombian-installed-services-handler new file mode 160000 index 0000000..7aae904 --- /dev/null +++ b/stage9/15-iombian-installed-services-handler/iombian-installed-services-handler @@ -0,0 +1 @@ +Subproject commit 7aae904b6170038b60ad8ca5ee84493d0c790326 diff --git a/stage9/16-iombian-installed-services-downloader/iombian-installed-services-downloader b/stage9/16-iombian-installed-services-downloader/iombian-installed-services-downloader new file mode 160000 index 0000000..8bf511c --- /dev/null +++ b/stage9/16-iombian-installed-services-downloader/iombian-installed-services-downloader @@ -0,0 +1 @@ +Subproject commit 8bf511ce835880a26bfc4de7f219884695ea01ce diff --git a/stage9/17-iombian-updatable-services-handler/iombian-updatable-services-handler b/stage9/17-iombian-updatable-services-handler/iombian-updatable-services-handler new file mode 160000 index 0000000..505cebe --- /dev/null +++ b/stage9/17-iombian-updatable-services-handler/iombian-updatable-services-handler @@ -0,0 +1 @@ +Subproject commit 505cebe37e7b97ede32555ca30c039a587adb7b7 diff --git a/stage9/19-iombian-display-handler/iombian-display-handler b/stage9/19-iombian-display-handler/iombian-display-handler new file mode 160000 index 0000000..dde14e9 --- /dev/null +++ b/stage9/19-iombian-display-handler/iombian-display-handler @@ -0,0 +1 @@ +Subproject commit dde14e9ec06d675502d0f0d46d78a53bfa51fde1 From 70a458f29dd50a243b0edc01d06a9f0a1bfb997a Mon Sep 17 00:00:00 2001 From: Aitor Iturrioz Date: Mon, 10 Jun 2024 12:14:43 +0200 Subject: [PATCH 19/30] Install iombian-config-file-handler as a systemd service Signed-off-by: Aitor Iturrioz --- .../00-packages | 2 ++ .../00-run-chroot.sh | 17 ----------- .../11-iombian-config-file-handler/01-run.sh | 30 ++++++++++++++++--- .../env-vars/.env | 4 --- 4 files changed, 28 insertions(+), 25 deletions(-) create mode 100755 stage9/11-iombian-config-file-handler/00-packages delete mode 100644 stage9/11-iombian-config-file-handler/00-run-chroot.sh mode change 100644 => 100755 stage9/11-iombian-config-file-handler/01-run.sh delete mode 100644 stage9/11-iombian-config-file-handler/env-vars/.env diff --git a/stage9/11-iombian-config-file-handler/00-packages b/stage9/11-iombian-config-file-handler/00-packages new file mode 100755 index 0000000..17721b8 --- /dev/null +++ b/stage9/11-iombian-config-file-handler/00-packages @@ -0,0 +1,2 @@ +python3-venv +python3-dev \ No newline at end of file diff --git a/stage9/11-iombian-config-file-handler/00-run-chroot.sh b/stage9/11-iombian-config-file-handler/00-run-chroot.sh deleted file mode 100644 index 4ff75ea..0000000 --- a/stage9/11-iombian-config-file-handler/00-run-chroot.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -e - -SERVICES_FOLDER_PATH="/opt/iombian-services" -SERVICE_NAME="iombian-config-file-handler" -SERVICE_VERSION="0.1.0" - -# Create service folder -mkdir -p ${SERVICES_FOLDER_PATH}/${SERVICE_NAME} - -# Download service file locally -wget https://raw.githubusercontent.com/Tknika/iombian-services-marketplace/main/services/${SERVICE_NAME}/${SERVICE_VERSION}/docker-compose.yaml -P ${SERVICES_FOLDER_PATH}/${SERVICE_NAME} - -# Asign correct ownership to the folder -chown -R ${FIRST_USER_NAME}:${FIRST_USER_NAME} ${SERVICES_FOLDER_PATH}/${SERVICE_NAME} - -# Pull docker image -docker compose -f ${SERVICES_FOLDER_PATH}/${SERVICE_NAME}/docker-compose.yaml pull \ No newline at end of file diff --git a/stage9/11-iombian-config-file-handler/01-run.sh b/stage9/11-iombian-config-file-handler/01-run.sh old mode 100644 new mode 100755 index fd3f966..e6c5503 --- a/stage9/11-iombian-config-file-handler/01-run.sh +++ b/stage9/11-iombian-config-file-handler/01-run.sh @@ -1,7 +1,29 @@ #!/bin/bash -e -SERVICES_FOLDER_PATH="/opt/iombian-services" -SERVICE_NAME="iombian-config-file-handler" +PROJECT_NAME="iombian-config-file-handler" +INSTALLATION_PATH="/opt/${PROJECT_NAME}" -# Copy .env file to service folder -install -m 644 -g ${FIRST_USER_NAME} -o ${FIRST_USER_NAME} env-vars/.env ${ROOTFS_DIR}${SERVICES_FOLDER_PATH}/${SERVICE_NAME}/.env \ No newline at end of file +# Create the installation folder +on_chroot << EOF +if [ -d "$INSTALLATION_PATH" ]; then + rm -rf ${INSTALLATION_PATH} +fi +mkdir -p $INSTALLATION_PATH +EOF + +install -m 644 -g root -o root ${PROJECT_NAME}/requirements.txt ${ROOTFS_DIR}$INSTALLATION_PATH +install -m 644 -g root -o root ${PROJECT_NAME}/systemd/${PROJECT_NAME}.service ${ROOTFS_DIR}/etc/systemd/system +cp -r ${PROJECT_NAME}/src/* ${ROOTFS_DIR}$INSTALLATION_PATH + +# Create the virtual environment +on_chroot << EOF +cd $INSTALLATION_PATH +python3 -m venv venv +source venv/bin/activate +pip install --upgrade pip setuptools wheel +pip install -r requirements.txt + +chown -R $FIRST_USER_NAME:$FIRST_USER_NAME $INSTALLATION_PATH + +systemctl enable ${PROJECT_NAME} +EOF \ No newline at end of file diff --git a/stage9/11-iombian-config-file-handler/env-vars/.env b/stage9/11-iombian-config-file-handler/env-vars/.env deleted file mode 100644 index e8b0eb6..0000000 --- a/stage9/11-iombian-config-file-handler/env-vars/.env +++ /dev/null @@ -1,4 +0,0 @@ -RESET_EVENT=long_long_click -BUTTON_EVENTS_PORT=5556 -SHUTDOWN_SERVICE_PORT=5558 -LOG_LEVEL=INFO \ No newline at end of file From 0931e068645b565d16466d5bd99d97be10eab7e1 Mon Sep 17 00:00:00 2001 From: Aitor Iturrioz Date: Mon, 10 Jun 2024 12:15:53 +0200 Subject: [PATCH 20/30] Install iombian-installed-services-handler as a systemd service Signed-off-by: Aitor Iturrioz --- .../00-packages | 2 ++ .../01-run.sh | 29 +++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100755 stage9/15-iombian-installed-services-handler/00-packages create mode 100755 stage9/15-iombian-installed-services-handler/01-run.sh diff --git a/stage9/15-iombian-installed-services-handler/00-packages b/stage9/15-iombian-installed-services-handler/00-packages new file mode 100755 index 0000000..17721b8 --- /dev/null +++ b/stage9/15-iombian-installed-services-handler/00-packages @@ -0,0 +1,2 @@ +python3-venv +python3-dev \ No newline at end of file diff --git a/stage9/15-iombian-installed-services-handler/01-run.sh b/stage9/15-iombian-installed-services-handler/01-run.sh new file mode 100755 index 0000000..b113fad --- /dev/null +++ b/stage9/15-iombian-installed-services-handler/01-run.sh @@ -0,0 +1,29 @@ +#!/bin/bash -e + +PROJECT_NAME="iombian-installed-services-handler" +INSTALLATION_PATH="/opt/${PROJECT_NAME}" + +# Create the installation folder +on_chroot << EOF +if [ -d "$INSTALLATION_PATH" ]; then + rm -rf ${INSTALLATION_PATH} +fi +mkdir -p $INSTALLATION_PATH +EOF + +install -m 644 -g root -o root ${PROJECT_NAME}/requirements.txt ${ROOTFS_DIR}$INSTALLATION_PATH +install -m 644 -g root -o root ${PROJECT_NAME}/systemd/${PROJECT_NAME}.service ${ROOTFS_DIR}/etc/systemd/system +cp -r ${PROJECT_NAME}/src/* ${ROOTFS_DIR}$INSTALLATION_PATH + +# Create the virtual environment +on_chroot << EOF +cd $INSTALLATION_PATH +python3 -m venv venv +source venv/bin/activate +pip install --upgrade pip setuptools wheel +pip install -r requirements.txt + +chown -R $FIRST_USER_NAME:$FIRST_USER_NAME $INSTALLATION_PATH + +systemctl enable ${PROJECT_NAME} +EOF \ No newline at end of file From ed3799637a844272fd4eeec4677ead179bd5ec5c Mon Sep 17 00:00:00 2001 From: Aitor Iturrioz Date: Mon, 10 Jun 2024 12:16:08 +0200 Subject: [PATCH 21/30] Install iombian-installed-services-downloader as a systemd service Signed-off-by: Aitor Iturrioz --- .../00-packages | 2 ++ .../01-run.sh | 29 +++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100755 stage9/16-iombian-installed-services-downloader/00-packages create mode 100755 stage9/16-iombian-installed-services-downloader/01-run.sh diff --git a/stage9/16-iombian-installed-services-downloader/00-packages b/stage9/16-iombian-installed-services-downloader/00-packages new file mode 100755 index 0000000..17721b8 --- /dev/null +++ b/stage9/16-iombian-installed-services-downloader/00-packages @@ -0,0 +1,2 @@ +python3-venv +python3-dev \ No newline at end of file diff --git a/stage9/16-iombian-installed-services-downloader/01-run.sh b/stage9/16-iombian-installed-services-downloader/01-run.sh new file mode 100755 index 0000000..204cd0c --- /dev/null +++ b/stage9/16-iombian-installed-services-downloader/01-run.sh @@ -0,0 +1,29 @@ +#!/bin/bash -e + +PROJECT_NAME="iombian-installed-services-downloader" +INSTALLATION_PATH="/opt/${PROJECT_NAME}" + +# Create the installation folder +on_chroot << EOF +if [ -d "$INSTALLATION_PATH" ]; then + rm -rf ${INSTALLATION_PATH} +fi +mkdir -p $INSTALLATION_PATH +EOF + +install -m 644 -g root -o root ${PROJECT_NAME}/requirements.txt ${ROOTFS_DIR}$INSTALLATION_PATH +install -m 644 -g root -o root ${PROJECT_NAME}/systemd/${PROJECT_NAME}.service ${ROOTFS_DIR}/etc/systemd/system +cp -r ${PROJECT_NAME}/src/* ${ROOTFS_DIR}$INSTALLATION_PATH + +# Create the virtual environment +on_chroot << EOF +cd $INSTALLATION_PATH +python3 -m venv venv +source venv/bin/activate +pip install --upgrade pip setuptools wheel +pip install -r requirements.txt + +chown -R $FIRST_USER_NAME:$FIRST_USER_NAME $INSTALLATION_PATH + +systemctl enable ${PROJECT_NAME} +EOF \ No newline at end of file From a386143a86f358a590bf4269e77c48a50b369f58 Mon Sep 17 00:00:00 2001 From: Aitor Iturrioz Date: Mon, 10 Jun 2024 12:16:23 +0200 Subject: [PATCH 22/30] Install iombian-updatable-services-handler as a systemd service Signed-off-by: Aitor Iturrioz --- .../00-packages | 2 ++ .../01-run.sh | 29 +++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100755 stage9/17-iombian-updatable-services-handler/00-packages create mode 100755 stage9/17-iombian-updatable-services-handler/01-run.sh diff --git a/stage9/17-iombian-updatable-services-handler/00-packages b/stage9/17-iombian-updatable-services-handler/00-packages new file mode 100755 index 0000000..17721b8 --- /dev/null +++ b/stage9/17-iombian-updatable-services-handler/00-packages @@ -0,0 +1,2 @@ +python3-venv +python3-dev \ No newline at end of file diff --git a/stage9/17-iombian-updatable-services-handler/01-run.sh b/stage9/17-iombian-updatable-services-handler/01-run.sh new file mode 100755 index 0000000..3a23e7c --- /dev/null +++ b/stage9/17-iombian-updatable-services-handler/01-run.sh @@ -0,0 +1,29 @@ +#!/bin/bash -e + +PROJECT_NAME="iombian-updatable-services-handler" +INSTALLATION_PATH="/opt/${PROJECT_NAME}" + +# Create the installation folder +on_chroot << EOF +if [ -d "$INSTALLATION_PATH" ]; then + rm -rf ${INSTALLATION_PATH} +fi +mkdir -p $INSTALLATION_PATH +EOF + +install -m 644 -g root -o root ${PROJECT_NAME}/requirements.txt ${ROOTFS_DIR}$INSTALLATION_PATH +install -m 644 -g root -o root ${PROJECT_NAME}/systemd/${PROJECT_NAME}.service ${ROOTFS_DIR}/etc/systemd/system +cp -r ${PROJECT_NAME}/src/* ${ROOTFS_DIR}$INSTALLATION_PATH + +# Create the virtual environment +on_chroot << EOF +cd $INSTALLATION_PATH +python3 -m venv venv +source venv/bin/activate +pip install --upgrade pip setuptools wheel +pip install -r requirements.txt + +chown -R $FIRST_USER_NAME:$FIRST_USER_NAME $INSTALLATION_PATH + +systemctl enable ${PROJECT_NAME} +EOF \ No newline at end of file From 7c8ccd72130cce032cacc35e6125f92433e11c53 Mon Sep 17 00:00:00 2001 From: Aitor Iturrioz Date: Mon, 10 Jun 2024 12:17:25 +0200 Subject: [PATCH 23/30] Use project_name var in the installation_path definition Signed-off-by: Aitor Iturrioz --- stage9/12-iombian-bluetooth-configurator/01-run.sh | 2 +- stage9/13-iombian-serial-configurator/01-run.sh | 2 +- stage9/14-iombian-remote-configurator/01-run.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/stage9/12-iombian-bluetooth-configurator/01-run.sh b/stage9/12-iombian-bluetooth-configurator/01-run.sh index b5c22d6..d4235d2 100755 --- a/stage9/12-iombian-bluetooth-configurator/01-run.sh +++ b/stage9/12-iombian-bluetooth-configurator/01-run.sh @@ -1,7 +1,7 @@ #!/bin/bash -e PROJECT_NAME="iombian-bluetooth-configurator" -INSTALLATION_PATH="/opt/iombian-bluetooth-configurator" +INSTALLATION_PATH="/opt/${PROJECT_NAME}" # Create the installation folder on_chroot << EOF diff --git a/stage9/13-iombian-serial-configurator/01-run.sh b/stage9/13-iombian-serial-configurator/01-run.sh index 41b16f9..6c5d957 100755 --- a/stage9/13-iombian-serial-configurator/01-run.sh +++ b/stage9/13-iombian-serial-configurator/01-run.sh @@ -1,7 +1,7 @@ #!/bin/bash -e PROJECT_NAME="iombian-serial-configurator" -INSTALLATION_PATH="/opt/iombian-serial-configurator" +INSTALLATION_PATH="/opt/${PROJECT_NAME}" # Enable DWC2 dtoverlay on_chroot << EOF diff --git a/stage9/14-iombian-remote-configurator/01-run.sh b/stage9/14-iombian-remote-configurator/01-run.sh index 729ed03..35ad51b 100755 --- a/stage9/14-iombian-remote-configurator/01-run.sh +++ b/stage9/14-iombian-remote-configurator/01-run.sh @@ -1,7 +1,7 @@ #!/bin/bash -e PROJECT_NAME="iombian-remote-configurator" -INSTALLATION_PATH="/opt/iombian-remote-configurator" +INSTALLATION_PATH="/opt/${PROJECT_NAME}" # Create the installation folder on_chroot << EOF From c24b2b3ea3082ed04a37164250bd351940e1921b Mon Sep 17 00:00:00 2001 From: Aitor Iturrioz Date: Mon, 10 Jun 2024 12:18:21 +0200 Subject: [PATCH 24/30] Use project_name var in the installation_path definition Signed-off-by: Aitor Iturrioz --- stage9/19-iombian-display-handler/01-run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stage9/19-iombian-display-handler/01-run.sh b/stage9/19-iombian-display-handler/01-run.sh index 985cd22..7f3875b 100755 --- a/stage9/19-iombian-display-handler/01-run.sh +++ b/stage9/19-iombian-display-handler/01-run.sh @@ -1,7 +1,7 @@ #!/bin/bash -e PROJECT_NAME="iombian-display-handler" -INSTALLATION_PATH="/opt/iombian-display-handler" +INSTALLATION_PATH="/opt/${PROJECT_NAME}" # Enable I2C and SPI on_chroot << EOF From 2d09e12cc522c14ce37d608682fb68eb31fd5279 Mon Sep 17 00:00:00 2001 From: Aitor Iturrioz Date: Tue, 9 Jul 2024 09:00:03 +0200 Subject: [PATCH 25/30] Update submodules versions Signed-off-by: Aitor Iturrioz --- .../14-iombian-remote-configurator/iombian-remote-configurator | 2 +- .../iombian-installed-services-handler | 2 +- .../iombian-installed-services-downloader | 2 +- .../iombian-updatable-services-handler | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stage9/14-iombian-remote-configurator/iombian-remote-configurator b/stage9/14-iombian-remote-configurator/iombian-remote-configurator index 3212f79..3854553 160000 --- a/stage9/14-iombian-remote-configurator/iombian-remote-configurator +++ b/stage9/14-iombian-remote-configurator/iombian-remote-configurator @@ -1 +1 @@ -Subproject commit 3212f795a7c4bfa2fc2e6c57e27e56ff8a344f09 +Subproject commit 3854553ed35006657657c89fe659e4f4218a2402 diff --git a/stage9/15-iombian-installed-services-handler/iombian-installed-services-handler b/stage9/15-iombian-installed-services-handler/iombian-installed-services-handler index 7aae904..45740b7 160000 --- a/stage9/15-iombian-installed-services-handler/iombian-installed-services-handler +++ b/stage9/15-iombian-installed-services-handler/iombian-installed-services-handler @@ -1 +1 @@ -Subproject commit 7aae904b6170038b60ad8ca5ee84493d0c790326 +Subproject commit 45740b767af0726ca06b396d9d7796f3da21ef63 diff --git a/stage9/16-iombian-installed-services-downloader/iombian-installed-services-downloader b/stage9/16-iombian-installed-services-downloader/iombian-installed-services-downloader index 8bf511c..9ca5e3a 160000 --- a/stage9/16-iombian-installed-services-downloader/iombian-installed-services-downloader +++ b/stage9/16-iombian-installed-services-downloader/iombian-installed-services-downloader @@ -1 +1 @@ -Subproject commit 8bf511ce835880a26bfc4de7f219884695ea01ce +Subproject commit 9ca5e3aa144a047e06b326c16ef1f8112518a21d diff --git a/stage9/17-iombian-updatable-services-handler/iombian-updatable-services-handler b/stage9/17-iombian-updatable-services-handler/iombian-updatable-services-handler index 505cebe..2f2d1b4 160000 --- a/stage9/17-iombian-updatable-services-handler/iombian-updatable-services-handler +++ b/stage9/17-iombian-updatable-services-handler/iombian-updatable-services-handler @@ -1 +1 @@ -Subproject commit 505cebe37e7b97ede32555ca30c039a587adb7b7 +Subproject commit 2f2d1b468385d2bddd85cf1c8a5af3d6898d10c3 From b982b6ca647b6e96b27f56d3f4811b9fcc3e1bfe Mon Sep 17 00:00:00 2001 From: Aitor Iturrioz Date: Tue, 9 Jul 2024 09:13:06 +0200 Subject: [PATCH 26/30] Update iombian-bluetooth-configurator to latest version Signed-off-by: Aitor Iturrioz --- .../iombian-bluetooth-configurator | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stage9/12-iombian-bluetooth-configurator/iombian-bluetooth-configurator b/stage9/12-iombian-bluetooth-configurator/iombian-bluetooth-configurator index 7a4be6f..1548d83 160000 --- a/stage9/12-iombian-bluetooth-configurator/iombian-bluetooth-configurator +++ b/stage9/12-iombian-bluetooth-configurator/iombian-bluetooth-configurator @@ -1 +1 @@ -Subproject commit 7a4be6f632fe18a86d1c68b342aaf4c413748b34 +Subproject commit 1548d838f51ba4b589cbecf2a1eb7ec0d86ed5c7 From b4e3278495db66487127a1da019eb25b039e4f69 Mon Sep 17 00:00:00 2001 From: Aitor Iturrioz Date: Tue, 9 Jul 2024 12:29:17 +0200 Subject: [PATCH 27/30] Change virtual environment folder name Services: - iombian-installed-services-handler - iombian-installed-services-downloader - iombian-updatable-services-handler Signed-off-by: Aitor Iturrioz --- stage9/15-iombian-installed-services-handler/01-run.sh | 4 ++-- stage9/16-iombian-installed-services-downloader/01-run.sh | 4 ++-- stage9/17-iombian-updatable-services-handler/01-run.sh | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/stage9/15-iombian-installed-services-handler/01-run.sh b/stage9/15-iombian-installed-services-handler/01-run.sh index b113fad..8ca0ac4 100755 --- a/stage9/15-iombian-installed-services-handler/01-run.sh +++ b/stage9/15-iombian-installed-services-handler/01-run.sh @@ -18,8 +18,8 @@ cp -r ${PROJECT_NAME}/src/* ${ROOTFS_DIR}$INSTALLATION_PATH # Create the virtual environment on_chroot << EOF cd $INSTALLATION_PATH -python3 -m venv venv -source venv/bin/activate +python3 -m venv .venv +source .venv/bin/activate pip install --upgrade pip setuptools wheel pip install -r requirements.txt diff --git a/stage9/16-iombian-installed-services-downloader/01-run.sh b/stage9/16-iombian-installed-services-downloader/01-run.sh index 204cd0c..464d8bc 100755 --- a/stage9/16-iombian-installed-services-downloader/01-run.sh +++ b/stage9/16-iombian-installed-services-downloader/01-run.sh @@ -18,8 +18,8 @@ cp -r ${PROJECT_NAME}/src/* ${ROOTFS_DIR}$INSTALLATION_PATH # Create the virtual environment on_chroot << EOF cd $INSTALLATION_PATH -python3 -m venv venv -source venv/bin/activate +python3 -m venv .venv +source .venv/bin/activate pip install --upgrade pip setuptools wheel pip install -r requirements.txt diff --git a/stage9/17-iombian-updatable-services-handler/01-run.sh b/stage9/17-iombian-updatable-services-handler/01-run.sh index 3a23e7c..837856a 100755 --- a/stage9/17-iombian-updatable-services-handler/01-run.sh +++ b/stage9/17-iombian-updatable-services-handler/01-run.sh @@ -18,8 +18,8 @@ cp -r ${PROJECT_NAME}/src/* ${ROOTFS_DIR}$INSTALLATION_PATH # Create the virtual environment on_chroot << EOF cd $INSTALLATION_PATH -python3 -m venv venv -source venv/bin/activate +python3 -m venv .venv +source .venv/bin/activate pip install --upgrade pip setuptools wheel pip install -r requirements.txt From f9dbf52dd1870b2f10c6aa77c0b86c8bec3834ae Mon Sep 17 00:00:00 2001 From: Aitor Iturrioz Date: Tue, 9 Jul 2024 12:48:05 +0200 Subject: [PATCH 28/30] Fix systemd entrypoint file path for some services Signed-off-by: Aitor Iturrioz --- .../iombian-installed-services-handler | 2 +- .../iombian-installed-services-downloader | 2 +- .../iombian-updatable-services-handler | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/stage9/15-iombian-installed-services-handler/iombian-installed-services-handler b/stage9/15-iombian-installed-services-handler/iombian-installed-services-handler index 45740b7..c8feb78 160000 --- a/stage9/15-iombian-installed-services-handler/iombian-installed-services-handler +++ b/stage9/15-iombian-installed-services-handler/iombian-installed-services-handler @@ -1 +1 @@ -Subproject commit 45740b767af0726ca06b396d9d7796f3da21ef63 +Subproject commit c8feb780042139022c9c1aecdc183cea62cd749b diff --git a/stage9/16-iombian-installed-services-downloader/iombian-installed-services-downloader b/stage9/16-iombian-installed-services-downloader/iombian-installed-services-downloader index 9ca5e3a..aea8f65 160000 --- a/stage9/16-iombian-installed-services-downloader/iombian-installed-services-downloader +++ b/stage9/16-iombian-installed-services-downloader/iombian-installed-services-downloader @@ -1 +1 @@ -Subproject commit 9ca5e3aa144a047e06b326c16ef1f8112518a21d +Subproject commit aea8f65b9d27088daee03eca2e7b91f0e491f528 diff --git a/stage9/17-iombian-updatable-services-handler/iombian-updatable-services-handler b/stage9/17-iombian-updatable-services-handler/iombian-updatable-services-handler index 2f2d1b4..fd05670 160000 --- a/stage9/17-iombian-updatable-services-handler/iombian-updatable-services-handler +++ b/stage9/17-iombian-updatable-services-handler/iombian-updatable-services-handler @@ -1 +1 @@ -Subproject commit 2f2d1b468385d2bddd85cf1c8a5af3d6898d10c3 +Subproject commit fd056702b95c719c2e45e4758b3d57d898cf2718 From 8112f7713eedd37325732efd38400a4165d1701e Mon Sep 17 00:00:00 2001 From: Aitor Iturrioz Date: Tue, 9 Jul 2024 13:14:57 +0200 Subject: [PATCH 29/30] Specify yaml file path as an env var in config-file-handler systemd service file Signed-off-by: Aitor Iturrioz --- .../11-iombian-config-file-handler/iombian-config-file-handler | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stage9/11-iombian-config-file-handler/iombian-config-file-handler b/stage9/11-iombian-config-file-handler/iombian-config-file-handler index 32a63d3..cd03616 160000 --- a/stage9/11-iombian-config-file-handler/iombian-config-file-handler +++ b/stage9/11-iombian-config-file-handler/iombian-config-file-handler @@ -1 +1 @@ -Subproject commit 32a63d3423c4f1978605eddf34eafd7f54b2ee9f +Subproject commit cd03616be381396e5636571948d9b4b66d24c071 From 585da7388706a6e8945a1076f58e3dc14c265168 Mon Sep 17 00:00:00 2001 From: Aitor Iturrioz Date: Tue, 9 Jul 2024 13:59:14 +0200 Subject: [PATCH 30/30] Add iombian-shutdown-service to default image Signed-off-by: Aitor Iturrioz --- .gitmodules | 3 ++ .../00-run-chroot.sh | 0 .../10-iombian-shutdown-service/00-packages | 2 ++ stage9/10-iombian-shutdown-service/01-run.sh | 29 +++++++++++++++++++ .../iombian-shutdown-service | 1 + 5 files changed, 35 insertions(+) rename stage9/{10-services-folder => 08-services-folder}/00-run-chroot.sh (100%) create mode 100755 stage9/10-iombian-shutdown-service/00-packages create mode 100755 stage9/10-iombian-shutdown-service/01-run.sh create mode 160000 stage9/10-iombian-shutdown-service/iombian-shutdown-service diff --git a/.gitmodules b/.gitmodules index e5216e3..02a4fe5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -28,3 +28,6 @@ [submodule "stage9/19-iombian-display-handler/iombian-display-handler"] path = stage9/19-iombian-display-handler/iombian-display-handler url = https://github.com/Tknika/iombian-display-handler.git +[submodule "stage9/10-iombian-shutdown-service/iombian-shutdown-service"] + path = stage9/10-iombian-shutdown-service/iombian-shutdown-service + url = https://github.com/Tknika/iombian-shutdown-service.git diff --git a/stage9/10-services-folder/00-run-chroot.sh b/stage9/08-services-folder/00-run-chroot.sh similarity index 100% rename from stage9/10-services-folder/00-run-chroot.sh rename to stage9/08-services-folder/00-run-chroot.sh diff --git a/stage9/10-iombian-shutdown-service/00-packages b/stage9/10-iombian-shutdown-service/00-packages new file mode 100755 index 0000000..17721b8 --- /dev/null +++ b/stage9/10-iombian-shutdown-service/00-packages @@ -0,0 +1,2 @@ +python3-venv +python3-dev \ No newline at end of file diff --git a/stage9/10-iombian-shutdown-service/01-run.sh b/stage9/10-iombian-shutdown-service/01-run.sh new file mode 100755 index 0000000..e1b2300 --- /dev/null +++ b/stage9/10-iombian-shutdown-service/01-run.sh @@ -0,0 +1,29 @@ +#!/bin/bash -e + +PROJECT_NAME="iombian-shutdown-service" +INSTALLATION_PATH="/opt/${PROJECT_NAME}" + +# Create the installation folder +on_chroot << EOF +if [ -d "$INSTALLATION_PATH" ]; then + rm -rf ${INSTALLATION_PATH} +fi +mkdir -p $INSTALLATION_PATH +EOF + +install -m 644 -g root -o root ${PROJECT_NAME}/requirements.txt ${ROOTFS_DIR}$INSTALLATION_PATH +install -m 644 -g root -o root ${PROJECT_NAME}/systemd/${PROJECT_NAME}.service ${ROOTFS_DIR}/etc/systemd/system +cp -r ${PROJECT_NAME}/src/* ${ROOTFS_DIR}$INSTALLATION_PATH + +# Create the virtual environment +on_chroot << EOF +cd $INSTALLATION_PATH +python3 -m venv .venv +source .venv/bin/activate +pip install --upgrade pip setuptools wheel +pip install -r requirements.txt + +chown -R $FIRST_USER_NAME:$FIRST_USER_NAME $INSTALLATION_PATH + +systemctl enable ${PROJECT_NAME} +EOF \ No newline at end of file diff --git a/stage9/10-iombian-shutdown-service/iombian-shutdown-service b/stage9/10-iombian-shutdown-service/iombian-shutdown-service new file mode 160000 index 0000000..a95dab8 --- /dev/null +++ b/stage9/10-iombian-shutdown-service/iombian-shutdown-service @@ -0,0 +1 @@ +Subproject commit a95dab8e9cdfac885a6e7effe6a9245ca82b4d4a