From 61a445b8d906ee2cd76bec3336e61252cab7ef1a Mon Sep 17 00:00:00 2001 From: MickLesk <47820557+MickLesk@users.noreply.github.com> Date: Wed, 30 Sep 2026 20:11:41 +0200 Subject: [PATCH] Scripts: apt instead of apt-get, cleanup_lxc, nginx_enable_site, drop needless daemon-reloads --- ct/apache-couchdb.sh | 2 +- ct/casaos.sh | 2 +- ct/dotnetaspwebapi.sh | 2 +- ct/erpnext.sh | 2 +- ct/gramps-web.sh | 2 +- ct/keycloak.sh | 2 +- ct/opencloud.sh | 2 +- ct/reitti.sh | 4 ++-- ct/romm.sh | 2 +- ct/ubuntu.sh | 2 +- ct/uhf.sh | 2 +- ct/yunohost.sh | 2 +- install/alpine-install.sh | 1 + install/alpine-it-tools-install.sh | 4 +--- install/alpine-nextcloud-install.sh | 1 + install/alpine-redlib-install.sh | 4 +--- install/alpine-wakapi-install.sh | 1 + install/apache-tika-install.sh | 4 ++-- install/archivebox-install.sh | 4 ++-- install/babybuddy-install.sh | 2 +- install/changedetection-install.sh | 6 +++--- install/databasus-install.sh | 1 - install/docker-install.sh | 2 +- install/dolibarr-install.sh | 4 ++-- install/dotnetaspwebapi-install.sh | 4 ++-- install/flaresolverr-install.sh | 2 +- install/gramps-web-install.sh | 2 +- install/graylog-install.sh | 4 ++-- install/homarr-install.sh | 1 - install/homepage-install.sh | 2 +- install/ignis-install.sh | 4 +--- install/jackett-install.sh | 2 +- install/jdownloader-install.sh | 3 +-- install/kavita-install.sh | 2 +- install/kima-hub-install.sh | 2 +- install/livebook-install.sh | 2 +- install/manyfold-install.sh | 5 +---- install/netbox-install.sh | 1 - install/nginx-ui-install.sh | 1 - install/npmplus-install.sh | 1 + install/obsidian-livesync-install.sh | 2 +- install/opencloud-install.sh | 2 +- install/openhab-install.sh | 1 - install/plane-install.sh | 1 - install/reactive-resume-install.sh | 1 - install/romm-install.sh | 2 +- install/rss-bridge-install.sh | 1 - install/shinobi-install.sh | 8 ++++---- install/snapotter-install.sh | 1 - install/sqlserver2022-install.sh | 2 +- install/sqlserver2025-install.sh | 2 +- install/super-productivity-install.sh | 4 +--- install/tasmocompiler-install.sh | 2 +- install/thingsboard-install.sh | 1 - install/twingate-connector-install.sh | 2 +- install/wallos-install.sh | 2 +- install/yunohost-install.sh | 2 +- install/zerobyte-install.sh | 2 +- install/zerotier-one-install.sh | 3 +-- 59 files changed, 60 insertions(+), 79 deletions(-) diff --git a/ct/apache-couchdb.sh b/ct/apache-couchdb.sh index aebcde1bb..cfba95350 100644 --- a/ct/apache-couchdb.sh +++ b/ct/apache-couchdb.sh @@ -31,7 +31,7 @@ function update_script() { fi msg_info "Updating Apache CouchDB" apt_update_safe - $STD apt-get install -y --only-upgrade couchdb + $STD apt install -y --only-upgrade couchdb msg_ok "Updated Apache CouchDB" msg_ok "Updated successfully!" exit diff --git a/ct/casaos.sh b/ct/casaos.sh index c5f6e9845..fd1a5c79b 100644 --- a/ct/casaos.sh +++ b/ct/casaos.sh @@ -31,7 +31,7 @@ function update_script() { fi msg_info "Updating ${APP} LXC" apt_update_safe - $STD apt-get -y upgrade + $STD apt -y upgrade msg_ok "Updated ${APP} LXC" msg_ok "Updated successfully!" exit diff --git a/ct/dotnetaspwebapi.sh b/ct/dotnetaspwebapi.sh index 11cce63fc..8a89fc78d 100644 --- a/ct/dotnetaspwebapi.sh +++ b/ct/dotnetaspwebapi.sh @@ -31,7 +31,7 @@ function update_script() { fi msg_info "Updating ${APP} LXC" apt_update_safe - $STD apt-get -y upgrade + $STD apt -y upgrade msg_ok "Updated successfully!" exit } diff --git a/ct/erpnext.sh b/ct/erpnext.sh index 3c5dd73c0..e84fe3f0c 100644 --- a/ct/erpnext.sh +++ b/ct/erpnext.sh @@ -47,7 +47,7 @@ function update_script() { msg_ok "Backup created" msg_info "Installing Dependencies" - $STD apt-get install -y pkg-config + $STD apt install -y pkg-config $STD sudo -u frappe bash -c 'export PATH="$HOME/.local/bin:/usr/local/bin:$PATH"; cd /opt/frappe-bench && uv python install 3.14' msg_ok "Installed Dependencies" diff --git a/ct/gramps-web.sh b/ct/gramps-web.sh index 14f84fc02..d90e138e5 100644 --- a/ct/gramps-web.sh +++ b/ct/gramps-web.sh @@ -62,7 +62,7 @@ function update_script() { GRAMPS_VERSION=$(/opt/gramps-web/venv/bin/python3 -c "import gramps.version; print('%s%s' % (gramps.version.VERSION_TUPLE[0], gramps.version.VERSION_TUPLE[1]))" 2>/dev/null || echo "60") GRAMPS_PLUGINS_DIR="/opt/gramps-web/data/gramps/gramps${GRAMPS_VERSION}/plugins" mkdir -p "$GRAMPS_PLUGINS_DIR" - $STD wget -q https://github.com/gramps-project/addons/archive/refs/heads/master.zip -O /tmp/gramps-addons.zip + curl -fsSL -o /tmp/gramps-addons.zip https://github.com/gramps-project/addons/archive/refs/heads/master.zip for addon in FilterRules JSON; do unzip -p /tmp/gramps-addons.zip "addons-master/gramps${GRAMPS_VERSION}/download/${addon}.addon.tgz" | tar -xz -C "$GRAMPS_PLUGINS_DIR" diff --git a/ct/keycloak.sh b/ct/keycloak.sh index 1656127d7..c0a736cba 100644 --- a/ct/keycloak.sh +++ b/ct/keycloak.sh @@ -44,7 +44,7 @@ function update_script() { msg_info "Updating packages" apt_update_safe - $STD apt-get -y upgrade + $STD apt -y upgrade msg_ok "Updated packages" msg_info "Backup old Keycloak" diff --git a/ct/opencloud.sh b/ct/opencloud.sh index 8ffddf9b0..1ecf69b1b 100644 --- a/ct/opencloud.sh +++ b/ct/opencloud.sh @@ -39,7 +39,7 @@ function update_script() { msg_info "Updating packages" apt_update_safe - $STD apt-get dist-upgrade -y + $STD apt dist-upgrade -y ensure_dependencies "inotify-tools" msg_ok "Updated packages" diff --git a/ct/reitti.sh b/ct/reitti.sh index 27ee0f028..6ae928180 100644 --- a/ct/reitti.sh +++ b/ct/reitti.sh @@ -44,8 +44,8 @@ function update_script() { msg_info "Migrating to v4: Removing RabbitMQ" systemctl stop rabbitmq-server systemctl disable rabbitmq-server - $STD apt-get purge -y rabbitmq-server erlang-base - $STD apt-get autoremove -y + $STD apt purge -y rabbitmq-server erlang-base + $STD apt autoremove -y msg_ok "Removed RabbitMQ" fi diff --git a/ct/romm.sh b/ct/romm.sh index 7a2c883aa..647ec8b18 100644 --- a/ct/romm.sh +++ b/ct/romm.sh @@ -109,7 +109,7 @@ function update_script() { if [[ -f /etc/angie/http.d/romm.conf ]]; then if ! grep -q "js_content decode.decodeBase64" /etc/angie/http.d/romm.conf; then msg_info "Adding missing /decode and /cache locations to Angie config" - dpkg -l angie-module-njs &>/dev/null || $STD apt-get install -y angie-module-njs + dpkg -l angie-module-njs &>/dev/null || $STD apt install -y angie-module-njs grep -q "ngx_http_js_module.so" /etc/angie/angie.conf || sed -i '1i load_module modules/ngx_http_js_module.so;' /etc/angie/angie.conf mkdir -p /etc/angie/js "${ROMM_BASE}/cache" cat <<'JSEOF' >/etc/angie/js/decode.js diff --git a/ct/ubuntu.sh b/ct/ubuntu.sh index b1e98c600..358cdf183 100644 --- a/ct/ubuntu.sh +++ b/ct/ubuntu.sh @@ -31,7 +31,7 @@ function update_script() { fi msg_info "Updating ${APP} LXC" apt_update_safe - $STD apt-get -y upgrade + $STD apt -y upgrade msg_ok "Updated ${APP} LXC" msg_ok "Updated successfully!" exit diff --git a/ct/uhf.sh b/ct/uhf.sh index 1b62d6489..b731531b5 100644 --- a/ct/uhf.sh +++ b/ct/uhf.sh @@ -42,7 +42,7 @@ function update_script() { msg_info "Updating UHF Server" if dpkg -l ffmpeg 2>&1 | grep -q "ii"; then - apt remove ffmpeg -y && apt autoremove -y + $STD apt remove -y ffmpeg && $STD apt autoremove -y fi setup_ffmpeg fetch_and_deploy_gh_release "comskip" "swapplications/comskip" "prebuild" "latest" "/opt/comskip" "comskip-$(arch_resolve "x64" "arm64")-*.zip" diff --git a/ct/yunohost.sh b/ct/yunohost.sh index 80091e1c2..34f67d498 100644 --- a/ct/yunohost.sh +++ b/ct/yunohost.sh @@ -31,7 +31,7 @@ function update_script() { fi msg_info "Updating OS" apt_update_safe - $STD apt-get -y upgrade + $STD apt -y upgrade msg_ok "Updated OS" msg_info "Updating $APP LXC" diff --git a/install/alpine-install.sh b/install/alpine-install.sh index 7a2f0bbae..8f4aa18a8 100644 --- a/install/alpine-install.sh +++ b/install/alpine-install.sh @@ -19,3 +19,4 @@ msg_ok "Installed Dependencies" motd_ssh customize +cleanup_lxc diff --git a/install/alpine-it-tools-install.sh b/install/alpine-it-tools-install.sh index e72cecbdc..19fb287e7 100644 --- a/install/alpine-it-tools-install.sh +++ b/install/alpine-it-tools-install.sh @@ -45,8 +45,6 @@ msg_ok "Installed IT-Tools" motd_ssh customize -msg_info "Cleaning up" rm -rf /tmp/dist rm -f it-tools.zip -$STD apk cache clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/alpine-nextcloud-install.sh b/install/alpine-nextcloud-install.sh index f4ec02710..d1ac402ab 100644 --- a/install/alpine-nextcloud-install.sh +++ b/install/alpine-nextcloud-install.sh @@ -194,3 +194,4 @@ msg_ok "Finished Nextcloud Setup-Wizard" motd_ssh customize +cleanup_lxc diff --git a/install/alpine-redlib-install.sh b/install/alpine-redlib-install.sh index efa24ae89..1e7c72156 100644 --- a/install/alpine-redlib-install.sh +++ b/install/alpine-redlib-install.sh @@ -93,6 +93,4 @@ msg_ok "Started Redlib Service" motd_ssh customize -msg_info "Cleaning up" -$STD apk cache clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/alpine-wakapi-install.sh b/install/alpine-wakapi-install.sh index 10a38b742..fc2f79c35 100644 --- a/install/alpine-wakapi-install.sh +++ b/install/alpine-wakapi-install.sh @@ -55,3 +55,4 @@ msg_ok "Started Wakapi" motd_ssh customize +cleanup_lxc diff --git a/install/apache-tika-install.sh b/install/apache-tika-install.sh index 9577eb6a9..55032ac7c 100644 --- a/install/apache-tika-install.sh +++ b/install/apache-tika-install.sh @@ -14,7 +14,7 @@ network_check update_os msg_info "Installing Dependencies" -$STD apt-get install -y \ +$STD apt install -y \ gdal-bin \ tesseract-ocr \ tesseract-ocr-eng \ @@ -24,7 +24,7 @@ $STD apt-get install -y \ tesseract-ocr-deu $STD echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections -$STD apt-get install -y \ +$STD apt install -y \ xfonts-utils \ fonts-freefont-ttf \ fonts-liberation \ diff --git a/install/archivebox-install.sh b/install/archivebox-install.sh index 5ae2c25e9..31c836588 100644 --- a/install/archivebox-install.sh +++ b/install/archivebox-install.sh @@ -14,7 +14,7 @@ network_check update_os msg_info "Installing Dependencies" -$STD apt-get install -y \ +$STD apt install -y \ git \ expect \ libssl-dev \ @@ -27,7 +27,7 @@ $STD apt-get install -y \ msg_ok "Installed Dependencies" msg_info "Installing Python Dependencies" -$STD apt-get install -y \ +$STD apt install -y \ python3-ldap \ python3-msgpack \ python3-regex diff --git a/install/babybuddy-install.sh b/install/babybuddy-install.sh index 9a1e4d959..0657a628b 100644 --- a/install/babybuddy-install.sh +++ b/install/babybuddy-install.sh @@ -14,7 +14,7 @@ network_check update_os msg_info "Installing Dependencies" -$STD apt-get install -y \ +$STD apt install -y \ uwsgi \ uwsgi-plugin-python3 \ libopenjp2-7-dev \ diff --git a/install/changedetection-install.sh b/install/changedetection-install.sh index 384189117..71b321a34 100644 --- a/install/changedetection-install.sh +++ b/install/changedetection-install.sh @@ -14,7 +14,7 @@ network_check update_os msg_info "Installing Dependencies (Patience)" -$STD apt-get install -y \ +$STD apt install -y \ git \ build-essential \ dumb-init \ @@ -85,7 +85,7 @@ $STD npm prune production --prefix /opt/browserless msg_ok "Installed Browserless & Playwright" msg_info "Installing Font Packages" -$STD apt-get install -y \ +$STD apt install -y \ fontconfig \ libfontconfig1 \ fonts-freefont-ttf \ @@ -100,7 +100,7 @@ $STD apt-get install -y \ msg_ok "Installed Font Packages" msg_info "Installing X11 Packages" -$STD apt-get install -y \ +$STD apt install -y \ libx11-6 \ libx11-xcb1 \ libxcb1 \ diff --git a/install/databasus-install.sh b/install/databasus-install.sh index 2ac3e5c87..7cec0d1d2 100644 --- a/install/databasus-install.sh +++ b/install/databasus-install.sh @@ -159,7 +159,6 @@ StandardError=journal [Install] WantedBy=multi-user.target EOF -$STD systemctl daemon-reload $STD systemctl enable -q --now databasus msg_ok "Created Databasus Service" diff --git a/install/docker-install.sh b/install/docker-install.sh index a239279a1..6eb863f1c 100644 --- a/install/docker-install.sh +++ b/install/docker-install.sh @@ -30,7 +30,7 @@ setup_deb_based() { if [[ -n "$socket" ]]; then msg_info "Enabling Docker TCP socket on $socket" - $STD apt-get install -y jq + $STD apt install -y jq tmpfile=$(mktemp) jq --arg sock "$socket" '. + { "hosts": ["unix:///var/run/docker.sock", $sock] }' /etc/docker/daemon.json >"$tmpfile" && mv "$tmpfile" /etc/docker/daemon.json diff --git a/install/dolibarr-install.sh b/install/dolibarr-install.sh index 975ade6ee..b6b6181d3 100644 --- a/install/dolibarr-install.sh +++ b/install/dolibarr-install.sh @@ -14,7 +14,7 @@ network_check update_os msg_info "Installing Dependencies" -$STD apt-get install -y \ +$STD apt install -y \ php-imap \ debconf-utils msg_ok "Installed Dependencies" @@ -36,7 +36,7 @@ RELEASE=$(curl -fsSL "$BASE" | grep -oP '(?<=/Dolibarr%20installer%20for%20Debia FILE=$(curl -fsSL "${BASE}${RELEASE}/" | grep -oP 'dolibarr_[^"]+_all.deb' | head -n1) curl -fsSL "https://altushost-swe.dl.sourceforge.net/project/dolibarr/Dolibarr%20installer%20for%20Debian-Ubuntu%20(DoliDeb)/${RELEASE}/${FILE}?viasf=1" -o ""$FILE"" echo "dolibarr dolibarr/reconfigure-webserver multiselect apache2" | debconf-set-selections -$STD apt-get install ./$FILE -y +$STD apt install ./$FILE -y $STD apt install -f rm -rf ~/$FILE echo "${RELEASE}" >"/opt/${APPLICATION}_version.txt" diff --git a/install/dotnetaspwebapi-install.sh b/install/dotnetaspwebapi-install.sh index 619efebb5..cbf41c42f 100644 --- a/install/dotnetaspwebapi-install.sh +++ b/install/dotnetaspwebapi-install.sh @@ -15,12 +15,12 @@ update_os msg_info "Installing Dependencies" apt_update_safe -$STD apt-get install -y \ +$STD apt install -y \ ssh \ software-properties-common $STD add-apt-repository -y ppa:dotnet/backports -$STD apt-get install -y \ +$STD apt install -y \ dotnet-sdk-9.0 \ vsftpd \ nginx diff --git a/install/flaresolverr-install.sh b/install/flaresolverr-install.sh index 36edc1ab4..945b41787 100644 --- a/install/flaresolverr-install.sh +++ b/install/flaresolverr-install.sh @@ -15,7 +15,7 @@ network_check update_os msg_info "Installing Dependencies" -$STD apt-get install -y \ +$STD apt install -y \ apt-transport-https \ xvfb msg_ok "Installed Dependencies" diff --git a/install/gramps-web-install.sh b/install/gramps-web-install.sh index f7df3692b..e8bd2497b 100644 --- a/install/gramps-web-install.sh +++ b/install/gramps-web-install.sh @@ -82,7 +82,7 @@ GRAMPS_PLUGINS_DIR="/opt/gramps-web/data/gramps/gramps${GRAMPS_VERSION}/plugins" mkdir -p "$GRAMPS_PLUGINS_DIR" msg_info "Installing Gramps Addons (gramps${GRAMPS_VERSION})" -$STD wget -q https://github.com/gramps-project/addons/archive/refs/heads/master.zip -O /tmp/gramps-addons.zip +curl -fsSL -o /tmp/gramps-addons.zip https://github.com/gramps-project/addons/archive/refs/heads/master.zip for addon in FilterRules JSON; do unzip -p /tmp/gramps-addons.zip "addons-master/gramps${GRAMPS_VERSION}/download/${addon}.addon.tgz" | \ tar -xz -C "$GRAMPS_PLUGINS_DIR" diff --git a/install/graylog-install.sh b/install/graylog-install.sh index e075ee788..d3f8c3406 100644 --- a/install/graylog-install.sh +++ b/install/graylog-install.sh @@ -20,13 +20,13 @@ PASSWORD_SECRET=$(openssl rand -base64 18 | tr -dc 'a-zA-Z0-9' | head -c16) curl -fsSL "https://packages.graylog2.org/repo/packages/graylog-7.0-repository_latest.deb" -o "graylog-7.0-repository_latest.deb" $STD dpkg -i graylog-7.0-repository_latest.deb apt_update_safe -$STD apt-get install graylog-datanode -y +$STD apt install graylog-datanode -y sed -i "s/password_secret =/password_secret = $PASSWORD_SECRET/g" /etc/graylog/datanode/datanode.conf systemctl enable -q --now graylog-datanode msg_ok "Setup Graylog Data Node" msg_info "Setup ${APPLICATION}" -$STD apt-get install graylog-server +$STD apt install graylog-server ROOT_PASSWORD=$(openssl rand -base64 18 | tr -dc 'a-zA-Z0-9' | head -c16) cat <~/graylog.creds ${APPLICATION} Credentials diff --git a/install/homarr-install.sh b/install/homarr-install.sh index db89c2542..108430fdc 100644 --- a/install/homarr-install.sh +++ b/install/homarr-install.sh @@ -79,7 +79,6 @@ ExecStart=/opt/homarr/run.sh WantedBy=multi-user.target EOF chmod +x /opt/homarr/run.sh -systemctl daemon-reload systemctl enable -q --now redis-server systemctl enable -q --now homarr systemctl disable -q --now nginx diff --git a/install/homepage-install.sh b/install/homepage-install.sh index 5417f5e7c..ac37afe6b 100644 --- a/install/homepage-install.sh +++ b/install/homepage-install.sh @@ -14,7 +14,7 @@ network_check update_os msg_info "Installing Dependencies" -$STD apt-get install -y jq +$STD apt install -y jq msg_ok "Installed Dependencies" NODE_VERSION="22" NODE_MODULE="pnpm@latest" setup_nodejs diff --git a/install/ignis-install.sh b/install/ignis-install.sh index 917ff07f0..1c2f9eea8 100644 --- a/install/ignis-install.sh +++ b/install/ignis-install.sh @@ -111,9 +111,7 @@ server { } } EOF -ln -sf /etc/nginx/sites-available/ignis.conf /etc/nginx/sites-enabled/ignis.conf -rm -f /etc/nginx/sites-enabled/default -systemctl restart nginx +nginx_enable_site ignis.conf msg_ok "Configured Nginx" motd_ssh diff --git a/install/jackett-install.sh b/install/jackett-install.sh index 291d6f3e1..16ac8d661 100644 --- a/install/jackett-install.sh +++ b/install/jackett-install.sh @@ -14,7 +14,7 @@ network_check update_os msg_info "Installing Dependencies" -$STD apt-get install -y libicu-dev +$STD apt install -y libicu-dev msg_ok "Installed Dependencies" fetch_and_deploy_gh_release "jackett" "Jackett/Jackett" "prebuild" "latest" "/opt/Jackett" "Jackett.Binaries.Linux$(arch_resolve "AMDx64" "ARM64").tar.gz" diff --git a/install/jdownloader-install.sh b/install/jdownloader-install.sh index df6c9a441..68c8e0ea0 100644 --- a/install/jdownloader-install.sh +++ b/install/jdownloader-install.sh @@ -34,7 +34,7 @@ msg_ok "Installed GUI Dependencies" msg_info "Downloading JDownloader" mkdir -p /opt/jdownloader -$STD wget -O /opt/jdownloader/JDownloader.jar https://installer.jdownloader.org/JDownloader.jar +curl -fsSL -o /opt/jdownloader/JDownloader.jar https://installer.jdownloader.org/JDownloader.jar msg_ok "Downloaded JDownloader" msg_info "Installing JDownloader (Patience)" @@ -194,7 +194,6 @@ EOF msg_ok "Created Services" msg_info "Starting Services" -systemctl daemon-reload systemctl enable -q --now xvfb sleep 2 systemctl enable -q --now openbox diff --git a/install/kavita-install.sh b/install/kavita-install.sh index 3f618bd48..469a52298 100644 --- a/install/kavita-install.sh +++ b/install/kavita-install.sh @@ -14,7 +14,7 @@ network_check update_os msg_info "Installing Dependencies" -$STD apt-get install -y libicu-dev +$STD apt install -y libicu-dev msg_ok "Installed Dependencies" fetch_and_deploy_gh_release "Kavita" "Kareadita/Kavita" "prebuild" "latest" "/opt/Kavita" "kavita-linux-$(arch_resolve "x64" "arm64").tar.gz" diff --git a/install/kima-hub-install.sh b/install/kima-hub-install.sh index 92fdc21bb..22e48f5ab 100644 --- a/install/kima-hub-install.sh +++ b/install/kima-hub-install.sh @@ -14,7 +14,7 @@ network_check update_os msg_info "Installing Dependencies" -$STD apt-get install -y \ +$STD apt install -y \ build-essential \ git \ openssl \ diff --git a/install/livebook-install.sh b/install/livebook-install.sh index d09e3d800..a8751f84a 100644 --- a/install/livebook-install.sh +++ b/install/livebook-install.sh @@ -14,7 +14,7 @@ network_check update_os msg_info "Installing Dependencies" -$STD apt-get install -y \ +$STD apt install -y \ build-essential \ ca-certificates \ cmake \ diff --git a/install/manyfold-install.sh b/install/manyfold-install.sh index 7f5d78a7f..064994c9c 100644 --- a/install/manyfold-install.sh +++ b/install/manyfold-install.sh @@ -148,7 +148,4 @@ msg_ok "Created Services" motd_ssh customize -msg_info "Cleaning up" -$STD apt-get -y autoremove -$STD apt-get -y autoclean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/netbox-install.sh b/install/netbox-install.sh index 21bd9efdc..d2b48ae5c 100644 --- a/install/netbox-install.sh +++ b/install/netbox-install.sh @@ -111,7 +111,6 @@ systemctl restart apache2 mv /opt/netbox/contrib/gunicorn.py /opt/netbox/gunicorn.py mv /opt/netbox/contrib/*.service /etc/systemd/system/ -systemctl daemon-reload systemctl enable -q --now netbox netbox-rq echo -e "Netbox Secret: \e[32m$SECRET_KEY\e[0m" >>~/netbox.creds msg_ok "Configured NetBox" diff --git a/install/nginx-ui-install.sh b/install/nginx-ui-install.sh index 7ddfc2b57..ea4374f20 100644 --- a/install/nginx-ui-install.sh +++ b/install/nginx-ui-install.sh @@ -65,7 +65,6 @@ KillMode=mixed [Install] WantedBy=multi-user.target EOF -systemctl daemon-reload msg_ok "Created Service" msg_info "Starting Service" diff --git a/install/npmplus-install.sh b/install/npmplus-install.sh index 7424d5d5e..742b75c98 100644 --- a/install/npmplus-install.sh +++ b/install/npmplus-install.sh @@ -86,3 +86,4 @@ msg_ok "Builded and started NPMplus" motd_ssh customize +cleanup_lxc diff --git a/install/obsidian-livesync-install.sh b/install/obsidian-livesync-install.sh index 0cff907ff..d8519441e 100644 --- a/install/obsidian-livesync-install.sh +++ b/install/obsidian-livesync-install.sh @@ -37,7 +37,7 @@ couchdb couchdb/adminpass seen true couchdb couchdb/adminpass_again password ${COUCHDB_PASSWORD} couchdb couchdb/adminpass_again seen true EOF -DEBIAN_FRONTEND=noninteractive $STD apt-get install -y couchdb +DEBIAN_FRONTEND=noninteractive $STD apt install -y couchdb cat </root/.couchdb.credentials COUCHDB_ADMIN_USER="${COUCHDB_ADMIN_USER}" diff --git a/install/opencloud-install.sh b/install/opencloud-install.sh index 34215b678..ab315507f 100644 --- a/install/opencloud-install.sh +++ b/install/opencloud-install.sh @@ -51,7 +51,7 @@ Suites: ./ Signed-By: /etc/apt/keyrings/collaboraonline-release-keyring.gpg EOF apt_update_safe -$STD apt-get install -y coolwsd code-brand +$STD apt install -y coolwsd code-brand systemctl stop coolwsd mkdir -p /etc/systemd/system/coolwsd.service.d cat </etc/systemd/system/coolwsd.service.d/override.conf diff --git a/install/openhab-install.sh b/install/openhab-install.sh index c2db5b59d..dc725a214 100644 --- a/install/openhab-install.sh +++ b/install/openhab-install.sh @@ -33,7 +33,6 @@ chown -R openhab:openhab /var/lib/openhab /etc/openhab /var/log/openhab msg_ok "Initialized openHAB directories" msg_info "Starting Service" -systemctl daemon-reload systemctl enable -q --now openhab msg_ok "Started Service" diff --git a/install/plane-install.sh b/install/plane-install.sh index 8f1ed6996..a6dfc940a 100644 --- a/install/plane-install.sh +++ b/install/plane-install.sh @@ -268,7 +268,6 @@ RestartSec=5 [Install] WantedBy=multi-user.target EOF -systemctl daemon-reload systemctl enable -q --now plane-api plane-worker plane-beat plane-live plane-space cat <~/plane.creds RabbitMQ User: plane diff --git a/install/reactive-resume-install.sh b/install/reactive-resume-install.sh index 27dc24cfa..8bb7ca28d 100644 --- a/install/reactive-resume-install.sh +++ b/install/reactive-resume-install.sh @@ -115,7 +115,6 @@ RestartSec=5 [Install] WantedBy=multi-user.target EOF -systemctl daemon-reload systemctl enable -q --now chromium-printer.service reactive-resume.service msg_ok "Created Services" diff --git a/install/romm-install.sh b/install/romm-install.sh index 15c3d8f76..4cdd027e4 100644 --- a/install/romm-install.sh +++ b/install/romm-install.sh @@ -49,7 +49,7 @@ setup_deb822_repo \ "https://download.angie.software/angie/debian/$(get_os_info version_id)" \ "$(get_os_info codename)" \ "main" -$STD apt-get install -y angie angie-module-zip angie-module-njs +$STD apt install -y angie angie-module-zip angie-module-njs sed -i '1i load_module modules/ngx_http_zip_module.so;\nload_module modules/ngx_http_js_module.so;' /etc/angie/angie.conf mkdir -p /etc/angie/js cat <<'EOF' >/etc/angie/js/decode.js diff --git a/install/rss-bridge-install.sh b/install/rss-bridge-install.sh index 348838e40..ed8563af8 100644 --- a/install/rss-bridge-install.sh +++ b/install/rss-bridge-install.sh @@ -55,7 +55,6 @@ EOF cat <>/etc/php/${PHP_VER}/fpm/pool.d/www.conf env[CURL_IMPERSONATE] = chrome142 EOF - $STD systemctl daemon-reload safe_service_restart php${PHP_VER}-fpm msg_ok "Enabled curl-impersonate for PHP-FPM" fi diff --git a/install/shinobi-install.sh b/install/shinobi-install.sh index 6107c6488..6020e3afa 100644 --- a/install/shinobi-install.sh +++ b/install/shinobi-install.sh @@ -16,16 +16,16 @@ update_os setup_hwaccel msg_info "Installing Dependencies" -$STD apt-get install -y make zip net-tools git -$STD apt-get install -y gcc g++ cmake -$STD apt-get install -y ca-certificates +$STD apt install -y make zip net-tools git +$STD apt install -y gcc g++ cmake +$STD apt install -y ca-certificates msg_ok "Installed Dependencies" NODE_VERSION="22" setup_nodejs setup_mariadb msg_info "Installing FFMPEG" -$STD apt-get install -y ffmpeg +$STD apt install -y ffmpeg msg_ok "Installed FFMPEG" msg_info "Cloning Shinobi" diff --git a/install/snapotter-install.sh b/install/snapotter-install.sh index 67609fe07..498d874bd 100644 --- a/install/snapotter-install.sh +++ b/install/snapotter-install.sh @@ -122,7 +122,6 @@ RestartSec=5 [Install] WantedBy=multi-user.target EOF -systemctl daemon-reload systemctl enable -q --now snapotter msg_ok "Created Service" diff --git a/install/sqlserver2022-install.sh b/install/sqlserver2022-install.sh index d0d6b6e6a..495622a9f 100644 --- a/install/sqlserver2022-install.sh +++ b/install/sqlserver2022-install.sh @@ -39,7 +39,7 @@ setup_deb822_repo \ "https://packages.microsoft.com/ubuntu/22.04/prod" \ "jammy" \ "main" -$STD apt-get install -y \ +$STD apt install -y \ mssql-tools18 \ unixodbc-dev echo 'export PATH="$PATH:/opt/mssql-tools18/bin"' >>~/.bash_profile diff --git a/install/sqlserver2025-install.sh b/install/sqlserver2025-install.sh index fe89280b9..1b6040575 100644 --- a/install/sqlserver2025-install.sh +++ b/install/sqlserver2025-install.sh @@ -39,7 +39,7 @@ setup_deb822_repo \ "https://packages.microsoft.com/ubuntu/24.04/prod" \ "noble" \ "main" -$STD apt-get install -y \ +$STD apt install -y \ mssql-tools18 \ unixodbc-dev echo 'export PATH="$PATH:/opt/mssql-tools18/bin"' >>~/.bash_profile diff --git a/install/super-productivity-install.sh b/install/super-productivity-install.sh index c4b4fe8c5..938bf2a87 100644 --- a/install/super-productivity-install.sh +++ b/install/super-productivity-install.sh @@ -51,9 +51,7 @@ server { } } EOF -ln -sf /etc/nginx/sites-available/super-productivity.conf /etc/nginx/sites-enabled/super-productivity.conf -rm -f /etc/nginx/sites-enabled/default -systemctl reload nginx +nginx_enable_site super-productivity.conf msg_ok "Configured Nginx" motd_ssh diff --git a/install/tasmocompiler-install.sh b/install/tasmocompiler-install.sh index ece36657b..bc4853cf8 100644 --- a/install/tasmocompiler-install.sh +++ b/install/tasmocompiler-install.sh @@ -14,7 +14,7 @@ network_check update_os msg_info "Installing Dependencies. Patience" -$STD apt-get install -y \ +$STD apt install -y \ git \ python3-venv msg_ok "Installed Dependencies" diff --git a/install/thingsboard-install.sh b/install/thingsboard-install.sh index d81dd27ec..48a2972d6 100644 --- a/install/thingsboard-install.sh +++ b/install/thingsboard-install.sh @@ -35,7 +35,6 @@ export SPRING_DATASOURCE_PASSWORD=${PG_DB_PASS} # Specify partitioning size for timestamp key-value storage. Allowed values: DAYS, MONTHS, YEARS, INDEFINITE. export SQL_POSTGRES_TS_KV_PARTITIONING=MONTHS EOF -systemctl daemon-reload msg_ok "Configured ThingsBoard" msg_info "Running ThingsBoard Installation Script" diff --git a/install/twingate-connector-install.sh b/install/twingate-connector-install.sh index 18070c5a6..f7f144eee 100644 --- a/install/twingate-connector-install.sh +++ b/install/twingate-connector-install.sh @@ -34,7 +34,7 @@ apt_update_safe msg_ok "Setup Twingate Repository" msg_info "Setup Twingate Connector" -$STD apt-get install -y twingate-connector +$STD apt install -y twingate-connector msg_ok "Setup Twingate Connector" msg_info "Configure Twingate-Connector" diff --git a/install/wallos-install.sh b/install/wallos-install.sh index 2694a32bd..be3a6bc50 100644 --- a/install/wallos-install.sh +++ b/install/wallos-install.sh @@ -44,7 +44,7 @@ $STD sudo -u www-data php /opt/wallos/endpoints/db/migrate.php msg_ok "Installed Wallos" msg_info "Setting up Crontabs" -$STD apt-get install -y cron +$STD apt install -y cron mkdir -p /var/log/cron cat </opt/wallos.cron 0 1 * * * php /opt/wallos/endpoints/cronjobs/updatenextpayment.php >> /var/log/cron/updatenextpayment.log 2>&1 diff --git a/install/yunohost-install.sh b/install/yunohost-install.sh index 437e6e2d2..1f36cd1d5 100644 --- a/install/yunohost-install.sh +++ b/install/yunohost-install.sh @@ -14,7 +14,7 @@ network_check update_os msg_info "Installing Dependencies" -$STD apt-get install -y \ +$STD apt install -y \ apt-transport-https \ lsb-release \ ca-certificates diff --git a/install/zerobyte-install.sh b/install/zerobyte-install.sh index 0625c5fa3..cb7bdd609 100644 --- a/install/zerobyte-install.sh +++ b/install/zerobyte-install.sh @@ -15,7 +15,7 @@ update_os msg_info "Installing Dependencies" echo "davfs2 davfs2/suid_file boolean false" | debconf-set-selections -$STD apt-get install -y \ +$STD apt install -y \ bzip2 \ fuse3 \ git \ diff --git a/install/zerotier-one-install.sh b/install/zerotier-one-install.sh index 6fd368011..a544834f6 100644 --- a/install/zerotier-one-install.sh +++ b/install/zerotier-one-install.sh @@ -37,7 +37,7 @@ msg_ok "Setup Zerotier-One" msg_info "Setting up UI" if [[ "$(arch_resolve)" == "arm64" ]]; then - $STD apt-get install -y build-essential python3 openssl + $STD apt install -y build-essential python3 openssl NODE_VERSION="20" setup_nodejs curl -fsSL "https://github.com/key-networks/ztncui/archive/refs/heads/master.tar.gz" -o /tmp/ztncui.tar.gz $STD tar -xzf /tmp/ztncui.tar.gz -C /tmp @@ -68,7 +68,6 @@ Restart=on-failure [Install] WantedBy=multi-user.target EOF - systemctl daemon-reload systemctl enable -q ztncui else curl -O https://s3-us-west-1.amazonaws.com/key-networks/deb/ztncui/1/x86_64/ztncui_0.8.14_amd64.deb