diff --git a/install/2fauth-install.sh b/install/2fauth-install.sh index f1d907138..7e4448f9b 100644 --- a/install/2fauth-install.sh +++ b/install/2fauth-install.sh @@ -97,9 +97,4 @@ msg_ok "Configured Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/actualbudget-install.sh b/install/actualbudget-install.sh index 356a4113a..828a0035c 100644 --- a/install/actualbudget-install.sh +++ b/install/actualbudget-install.sh @@ -89,9 +89,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/adguard-install.sh b/install/adguard-install.sh index e353bf73c..91d00de07 100644 --- a/install/adguard-install.sh +++ b/install/adguard-install.sh @@ -41,9 +41,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/adventurelog-install.sh b/install/adventurelog-install.sh index f53021af7..e0c078caf 100644 --- a/install/adventurelog-install.sh +++ b/install/adventurelog-install.sh @@ -146,9 +146,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/agentdvr-install.sh b/install/agentdvr-install.sh index 23251a134..c21bbe527 100644 --- a/install/agentdvr-install.sh +++ b/install/agentdvr-install.sh @@ -30,6 +30,7 @@ curl -fsSL "$RELEASE" -o $(basename "$RELEASE") $STD unzip Agent_Linux64*.zip chmod +x ./Agent echo $RELEASE >~/.agentdvr +rm -rf Agent_Linux64*.zip msg_ok "Installed AgentDVR" msg_info "Creating Service" @@ -53,10 +54,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -rm -rf Agent_Linux64*.zip -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/apache-cassandra-install.sh b/install/apache-cassandra-install.sh index 4dbf4663d..595c4b6ff 100644 --- a/install/apache-cassandra-install.sh +++ b/install/apache-cassandra-install.sh @@ -34,8 +34,4 @@ msg_ok "Installed Apache Cassandra" 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/apache-couchdb-install.sh b/install/apache-couchdb-install.sh index 9005dc078..dc3d4f128 100644 --- a/install/apache-couchdb-install.sh +++ b/install/apache-couchdb-install.sh @@ -36,8 +36,4 @@ msg_ok "Installed Apache CouchDB." 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/apache-guacamole-install.sh b/install/apache-guacamole-install.sh index a7736a007..0b1cf21c9 100644 --- a/install/apache-guacamole-install.sh +++ b/install/apache-guacamole-install.sh @@ -71,6 +71,8 @@ mv ~/mysql-connector-j-9.3.0/mysql-connector-j-9.3.0.jar /etc/guacamole/lib/ curl -fsSL "https://downloads.apache.org/guacamole/${RELEASE_SERVER}/binary/guacamole-auth-jdbc-${RELEASE_SERVER}.tar.gz" -o "/root/guacamole-auth-jdbc-${RELEASE_SERVER}.tar.gz" $STD tar -xf ~/guacamole-auth-jdbc-$RELEASE_SERVER.tar.gz mv ~/guacamole-auth-jdbc-$RELEASE_SERVER/mysql/guacamole-auth-jdbc-mysql-$RELEASE_SERVER.jar /etc/guacamole/extensions/ +rm -rf ~/mysql-connector-j-9.3.0{,.tar.gz} +rm -rf ~/guacamole-auth-jdbc-$RELEASE_SERVER{,.tar.gz} msg_ok "Setup Apache Guacamole" msg_info "Setup Database" @@ -146,10 +148,4 @@ msg_ok "Setup Service" motd_ssh customize - -msg_info "Cleaning up" -rm -rf ~/mysql-connector-j-9.3.0{,.tar.gz} -rm -rf ~/guacamole-auth-jdbc-$RELEASE_SERVER{,.tar.gz} -$STD apt -y autoremove -$STD apt -y autoclean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/apache-tika-install.sh b/install/apache-tika-install.sh index 0dfa3442d..9306dc4d7 100644 --- a/install/apache-tika-install.sh +++ b/install/apache-tika-install.sh @@ -69,8 +69,4 @@ msg_ok "Created Service" 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/apache-tomcat-install.sh b/install/apache-tomcat-install.sh index a7aaf23f3..3c27189db 100644 --- a/install/apache-tomcat-install.sh +++ b/install/apache-tomcat-install.sh @@ -119,7 +119,7 @@ curl -fsSL "$TOMCAT_URL" -o "/tmp/tomcat.tar.gz" mkdir -p /opt/tomcat-$TOMCAT_VERSION tar --strip-components=1 -xzf /tmp/tomcat.tar.gz -C /opt/tomcat-$TOMCAT_VERSION chown -R root:root /opt/tomcat-$TOMCAT_VERSION - +rm -f /tmp/tomcat.tar.gz cat </etc/systemd/system/tomcat.service [Unit] Description=Apache Tomcat Web Application Container @@ -147,9 +147,4 @@ msg_ok "Tomcat $LATEST_VERSION installed and started" motd_ssh customize - -msg_info "Cleaning up" -rm -f /tmp/tomcat.tar.gz -$STD apt-get -y autoremove -$STD apt-get -y autoclean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/apt-cacher-ng-install.sh b/install/apt-cacher-ng-install.sh index 1d50c4644..79bd5234a 100644 --- a/install/apt-cacher-ng-install.sh +++ b/install/apt-cacher-ng-install.sh @@ -16,7 +16,7 @@ update_os msg_info "Installing Apt-Cacher NG" DEBIAN_FRONTEND=noninteractive $STD apt-get -o Dpkg::Options::="--force-confold" install -y apt-cacher-ng sed -i 's/# PassThroughPattern: .* # this would allow CONNECT to everything/PassThroughPattern: .*/' /etc/apt-cacher-ng/acng.conf -cat << EOF >/etc/apt/apt.conf.d/00aptproxy.conf +cat </etc/apt/apt.conf.d/00aptproxy.conf Acquire::http::Proxy "http://localhost:3142"; EOF systemctl enable -q --now apt-cacher-ng @@ -24,8 +24,4 @@ msg_ok "Installed Apt-Cacher NG" 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/archivebox-install.sh b/install/archivebox-install.sh index 8c9e13e74..b5a298bbb 100644 --- a/install/archivebox-install.sh +++ b/install/archivebox-install.sh @@ -91,9 +91,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/argus-install.sh b/install/argus-install.sh index 60540eaab..305c9198f 100644 --- a/install/argus-install.sh +++ b/install/argus-install.sh @@ -82,8 +82,4 @@ msg_ok "Created Service" 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/aria2-install.sh b/install/aria2-install.sh index 4e6398418..a27d932f3 100644 --- a/install/aria2-install.sh +++ b/install/aria2-install.sh @@ -24,6 +24,7 @@ if [[ ${prompt,,} =~ ^(y|yes)$ ]]; then systemctl disable -q --now nginx curl -fsSL "$(curl -fsSL https://api.github.com/repos/mayswind/ariang/releases/latest | grep download | grep AllInOne.zip | cut -d\" -f4)" -o $(basename "$(curl -fsSL https://api.github.com/repos/mayswind/ariang/releases/latest | grep download | grep AllInOne.zip | cut -d\" -f4)") $STD unzip AriaNg-*-AllInOne.zip -d /var/www + rm AriaNg-*-AllInOne.zip rm /etc/nginx/sites-enabled/* cat </etc/nginx/conf.d/ariang.conf server { @@ -84,9 +85,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -rm AriaNg-*-AllInOne.zip -$STD apt-get -y autoremove -$STD apt-get -y autoclean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/asterisk-install.sh b/install/asterisk-install.sh index 202c12e10..737b8bf9b 100644 --- a/install/asterisk-install.sh +++ b/install/asterisk-install.sh @@ -88,6 +88,7 @@ curl -fsSL "$DOWNLOAD_URL" -o "$temp_file" mkdir -p /opt/asterisk tar zxf "$temp_file" --strip-components=1 -C /opt/asterisk cd /opt/asterisk +rm -f "$temp_file" msg_ok "Downloaded Asterisk ($RELEASE)" msg_info "Installing Asterisk" @@ -105,10 +106,5 @@ msg_ok "Installed Asterisk" motd_ssh customize +cleanup_lxc -msg_info "Cleaning up" -rm -f "$temp_file" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" diff --git a/install/audiobookshelf-install.sh b/install/audiobookshelf-install.sh index 2064797ed..0e6ba73c4 100644 --- a/install/audiobookshelf-install.sh +++ b/install/audiobookshelf-install.sh @@ -28,8 +28,4 @@ msg_ok "Setup audiobookshelf" 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/authelia-install.sh b/install/authelia-install.sh index d1e850483..62f72cca1 100644 --- a/install/authelia-install.sh +++ b/install/authelia-install.sh @@ -66,8 +66,4 @@ msg_ok "Authelia Setup completed" 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/autobrr-install.sh b/install/autobrr-install.sh index 42f7af37f..9a81f60c2 100644 --- a/install/autobrr-install.sh +++ b/install/autobrr-install.sh @@ -46,8 +46,4 @@ msg_ok "Created Service" 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/autocaliweb-install.sh b/install/autocaliweb-install.sh index 4c7b3c50c..8c2710fa4 100644 --- a/install/autocaliweb-install.sh +++ b/install/autocaliweb-install.sh @@ -15,34 +15,34 @@ update_os msg_info "Installing dependencies" $STD apt-get install -y --no-install-recommends \ - python3-dev \ - sqlite3 \ - build-essential \ - libldap2-dev \ - libssl-dev \ - libsasl2-dev \ - imagemagick \ - ghostscript \ - libmagic1 \ - libxi6 \ - libxslt1.1 \ - libxtst6 \ - libxrandr2 \ - libxkbfile1 \ - libxcomposite1 \ - libopengl0 \ - libnss3 \ - libxkbcommon0 \ - libegl1 \ - libxdamage1 \ - libgl1 \ - libglx-mesa0 \ - xz-utils \ - xdg-utils \ - inotify-tools \ - binutils \ - unrar-free \ - zip + python3-dev \ + sqlite3 \ + build-essential \ + libldap2-dev \ + libssl-dev \ + libsasl2-dev \ + imagemagick \ + ghostscript \ + libmagic1 \ + libxi6 \ + libxslt1.1 \ + libxtst6 \ + libxrandr2 \ + libxkbfile1 \ + libxcomposite1 \ + libopengl0 \ + libnss3 \ + libxkbcommon0 \ + libegl1 \ + libxdamage1 \ + libgl1 \ + libglx-mesa0 \ + xz-utils \ + xdg-utils \ + inotify-tools \ + binutils \ + unrar-free \ + zip msg_ok "Installed dependencies" fetch_and_deploy_gh_release "kepubify" "pgaskin/kepubify" "singlefile" "latest" "/usr/bin" "kepubify-linux-64bit" @@ -323,8 +323,4 @@ msg_ok "Created scripts and service files" 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/babybuddy-install.sh b/install/babybuddy-install.sh index 16b6e72d4..667a05dd5 100644 --- a/install/babybuddy-install.sh +++ b/install/babybuddy-install.sh @@ -97,8 +97,4 @@ msg_ok "Configured NGINX" 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/backrest-install.sh b/install/backrest-install.sh index f8cc5a06c..88e834df9 100644 --- a/install/backrest-install.sh +++ b/install/backrest-install.sh @@ -20,6 +20,7 @@ mkdir -p /opt/backrest/{bin,config,data} curl -fsSL "https://github.com/garethgeorge/backrest/releases/download/v${RELEASE}/backrest_Linux_x86_64.tar.gz" -o "$temp_file" tar xzf $temp_file -C /opt/backrest/bin chmod +x /opt/backrest/bin/backrest +rm -f "$temp_file" echo "${RELEASE}" >/opt/${APPLICATION}_version.txt msg_ok "Installed Backrest" @@ -46,9 +47,5 @@ msg_ok "Created Service" motd_ssh customize +cleanup_lxc -msg_info "Cleaning up" -rm -f "$temp_file" -$STD apt-get -y autoremove -$STD apt-get -y autoclean -msg_ok "Cleaned" diff --git a/install/baikal-install.sh b/install/baikal-install.sh index 67db918c8..5d8078679 100644 --- a/install/baikal-install.sh +++ b/install/baikal-install.sh @@ -25,10 +25,10 @@ DB_PASS=$(openssl rand -base64 18 | tr -dc 'a-zA-Z0-9' | cut -c1-13) $STD sudo -u postgres psql -c "CREATE ROLE $DB_USER WITH LOGIN PASSWORD '$DB_PASS';" $STD sudo -u postgres psql -c "CREATE DATABASE $DB_NAME WITH OWNER $DB_USER TEMPLATE template0;" { - echo "Baikal Credentials" - echo "Baikal Database User: $DB_USER" - echo "Baikal Database Password: $DB_PASS" - echo "Baikal Database Name: $DB_NAME" + echo "Baikal Credentials" + echo "Baikal Database User: $DB_USER" + echo "Baikal Database Password: $DB_PASS" + echo "Baikal Database Name: $DB_NAME" } >>~/baikal.creds msg_ok "Set up PostgreSQL Database" @@ -81,8 +81,4 @@ msg_ok "Created Service" 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/bar-assistant-install.sh b/install/bar-assistant-install.sh index 67901a96a..720091c61 100644 --- a/install/bar-assistant-install.sh +++ b/install/bar-assistant-install.sh @@ -17,10 +17,10 @@ update_os msg_info "Installing Dependencies" $STD apt-get install -y \ - redis-server \ - nginx \ - lsb-release \ - libvips + redis-server \ + nginx \ + lsb-release \ + libvips #php-{ffi,opcache,redis,zip,pdo-sqlite,bcmath,pdo,curl,dom,fpm} msg_ok "Installed Dependencies" @@ -41,14 +41,14 @@ msg_info "Configure MeiliSearch" curl -fsSL https://raw.githubusercontent.com/meilisearch/meilisearch/latest/config.toml -o /etc/meilisearch.toml MASTER_KEY=$(openssl rand -base64 12) sed -i \ - -e 's|^env =.*|env = "production"|' \ - -e "s|^# master_key =.*|master_key = \"$MASTER_KEY\"|" \ - -e 's|^db_path =.*|db_path = "/var/lib/meilisearch/data"|' \ - -e 's|^dump_dir =.*|dump_dir = "/var/lib/meilisearch/dumps"|' \ - -e 's|^snapshot_dir =.*|snapshot_dir = "/var/lib/meilisearch/snapshots"|' \ - -e 's|^# no_analytics = true|no_analytics = true|' \ - -e 's|^http_addr =.*|http_addr = "127.0.0.1:7700"|' \ - /etc/meilisearch.toml + -e 's|^env =.*|env = "production"|' \ + -e "s|^# master_key =.*|master_key = \"$MASTER_KEY\"|" \ + -e 's|^db_path =.*|db_path = "/var/lib/meilisearch/data"|' \ + -e 's|^dump_dir =.*|dump_dir = "/var/lib/meilisearch/dumps"|' \ + -e 's|^snapshot_dir =.*|snapshot_dir = "/var/lib/meilisearch/snapshots"|' \ + -e 's|^# no_analytics = true|no_analytics = true|' \ + -e 's|^http_addr =.*|http_addr = "127.0.0.1:7700"|' \ + /etc/meilisearch.toml msg_ok "Configured MeiliSearch" msg_info "Creating MeiliSearch service" @@ -77,11 +77,11 @@ MeiliSearch_API_KEY=$(curl -s -X GET 'http://127.0.0.1:7700/keys' -H "Authorizat MeiliSearch_API_KEY_UID=$(curl -s -X GET 'http://127.0.0.1:7700/keys' -H "Authorization: Bearer $MASTER_KEY" | grep -o '"uid":"[^"]*"' | head -n 1 | sed 's/"uid":"//;s/"//') LOCAL_IP=$(hostname -I | awk '{print $1}') sed -i -e "s|^APP_URL=|APP_URL=http://${LOCAL_IP}/bar/|" \ - -e "s|^MEILISEARCH_HOST=|MEILISEARCH_HOST=http://127.0.0.1:7700|" \ - -e "s|^MEILISEARCH_KEY=|MEILISEARCH_KEY=${MASTER_KEY}|" \ - -e "s|^MEILISEARCH_API_KEY=|MEILISEARCH_API_KEY=${MeiliSearch_API_KEY}|" \ - -e "s|^MEILISEARCH_API_KEY_UID=|MEILISEARCH_API_KEY_UID=${MeiliSearch_API_KEY_UID}|" \ - /opt/bar-assistant/.env + -e "s|^MEILISEARCH_HOST=|MEILISEARCH_HOST=http://127.0.0.1:7700|" \ + -e "s|^MEILISEARCH_KEY=|MEILISEARCH_KEY=${MASTER_KEY}|" \ + -e "s|^MEILISEARCH_API_KEY=|MEILISEARCH_API_KEY=${MeiliSearch_API_KEY}|" \ + -e "s|^MEILISEARCH_API_KEY_UID=|MEILISEARCH_API_KEY_UID=${MeiliSearch_API_KEY_UID}|" \ + /opt/bar-assistant/.env $STD composer install --no-interaction $STD php artisan key:generate touch storage/bar-assistant/database.ba3.sqlite @@ -190,8 +190,4 @@ msg_ok "Created Service" 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/bazarr-install.sh b/install/bazarr-install.sh index cb77ba396..0d6bc8b18 100755 --- a/install/bazarr-install.sh +++ b/install/bazarr-install.sh @@ -49,8 +49,4 @@ msg_ok "Created Service" 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/bentopdf-install.sh b/install/bentopdf-install.sh index 10a8b6f39..12c9f301e 100644 --- a/install/bentopdf-install.sh +++ b/install/bentopdf-install.sh @@ -45,9 +45,4 @@ msg_ok "Created & started service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/beszel-install.sh b/install/beszel-install.sh index a2116f000..ef88a70ab 100644 --- a/install/beszel-install.sh +++ b/install/beszel-install.sh @@ -39,8 +39,4 @@ msg_ok "Created Service" 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/bitmagnet-install.sh b/install/bitmagnet-install.sh index 31bf31b99..746d3ffa5 100644 --- a/install/bitmagnet-install.sh +++ b/install/bitmagnet-install.sh @@ -69,8 +69,4 @@ msg_ok "Created Service" 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/blocky-install.sh b/install/blocky-install.sh index 96bbe2b53..ced9a85ea 100644 --- a/install/blocky-install.sh +++ b/install/blocky-install.sh @@ -80,8 +80,4 @@ msg_ok "Created Service" 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/booklore-install.sh b/install/booklore-install.sh index e95067b72..fa506675d 100644 --- a/install/booklore-install.sh +++ b/install/booklore-install.sh @@ -106,8 +106,4 @@ msg_ok "Created BookLore Service" 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/bookstack-install.sh b/install/bookstack-install.sh index 4a3050483..8db515f7d 100644 --- a/install/bookstack-install.sh +++ b/install/bookstack-install.sh @@ -105,8 +105,4 @@ msg_ok "Created Services" motd_ssh customize - -msg_info "Cleaning up" -$STD apt-get autoremove -$STD apt-get autoclean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/bunkerweb-install.sh b/install/bunkerweb-install.sh index bab97d97f..2b39de6c1 100644 --- a/install/bunkerweb-install.sh +++ b/install/bunkerweb-install.sh @@ -44,8 +44,4 @@ msg_ok "Installed BunkerWeb v${RELEASE}" 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/bytestash-install.sh b/install/bytestash-install.sh index d6e4e393d..70739f2cf 100644 --- a/install/bytestash-install.sh +++ b/install/bytestash-install.sh @@ -66,8 +66,4 @@ msg_ok "Created Service" 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/caddy-install.sh b/install/caddy-install.sh index c4f94a9ea..e574162b0 100644 --- a/install/caddy-install.sh +++ b/install/caddy-install.sh @@ -43,8 +43,4 @@ fi 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/casaos-install.sh b/install/casaos-install.sh index 41804e19f..7908f81b5 100644 --- a/install/casaos-install.sh +++ b/install/casaos-install.sh @@ -32,8 +32,4 @@ msg_ok "Installed CasaOS" 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/changedetection-install.sh b/install/changedetection-install.sh index 45a616c7f..9dc940a63 100644 --- a/install/changedetection-install.sh +++ b/install/changedetection-install.sh @@ -141,8 +141,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/channels-install.sh b/install/channels-install.sh index af6ef88d4..2d9f75ddd 100644 --- a/install/channels-install.sh +++ b/install/channels-install.sh @@ -51,8 +51,4 @@ msg_ok "Installed Channels DVR Server" 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/checkmk-install.sh b/install/checkmk-install.sh index b408ca64d..1908171de 100644 --- a/install/checkmk-install.sh +++ b/install/checkmk-install.sh @@ -17,6 +17,7 @@ msg_info "Install Checkmk" RELEASE=$(curl -fsSL https://api.github.com/repos/checkmk/checkmk/tags | grep "name" | awk '{print substr($2, 3, length($2)-4) }' | tr ' ' '\n' | grep -Ev 'rc|b' | sort -V | tail -n 1) curl -fsSL "https://download.checkmk.com/checkmk/${RELEASE}/check-mk-raw-${RELEASE}_0.bookworm_amd64.deb" -o "/opt/checkmk.deb" $STD apt-get install -y /opt/checkmk.deb +rm -rf /opt/checkmk.deb echo "${RELEASE}" >"/opt/checkmk_version.txt" msg_ok "Installed Checkmk" @@ -40,8 +41,4 @@ $STD omd start "$SITE_NAME" msg_ok "Created Service" -msg_info "Cleaning up" -rm -rf /opt/checkmk.deb -$STD apt-get -y autoremove -$STD apt-get -y autoclean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/cleanuparr-install.sh b/install/cleanuparr-install.sh index 06903aa10..bdf326685 100755 --- a/install/cleanuparr-install.sh +++ b/install/cleanuparr-install.sh @@ -39,8 +39,4 @@ msg_ok "Created Service" 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/cloudflare-ddns-install.sh b/install/cloudflare-ddns-install.sh index b9ade1216..518329da4 100644 --- a/install/cloudflare-ddns-install.sh +++ b/install/cloudflare-ddns-install.sh @@ -79,8 +79,4 @@ msg_ok "Setup Service" 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/cloudflared-install.sh b/install/cloudflared-install.sh index 1e7fde831..5067b8b71 100644 --- a/install/cloudflared-install.sh +++ b/install/cloudflared-install.sh @@ -64,9 +64,4 @@ fi motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/cloudreve-install.sh b/install/cloudreve-install.sh index 74aa8f2bc..14171807a 100644 --- a/install/cloudreve-install.sh +++ b/install/cloudreve-install.sh @@ -36,8 +36,4 @@ msg_ok "Service Setup" 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/cockpit-install.sh b/install/cockpit-install.sh index 04f37d5b5..ad7524e10 100644 --- a/install/cockpit-install.sh +++ b/install/cockpit-install.sh @@ -60,8 +60,4 @@ fi motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/comfyui-install.sh b/install/comfyui-install.sh index 4f5b7de41..77bbeb086 100644 --- a/install/comfyui-install.sh +++ b/install/comfyui-install.sh @@ -19,11 +19,14 @@ echo "${TAB3}[1]-None [2]-NVIDIA [3]-AMD [4]-Intel" read -rp "${TAB3}Enter your choice [1-4] (default: 1): " gpu_choice gpu_choice=${gpu_choice:-1} case "$gpu_choice" in -1) comfyui_gpu_type="none";; -2) comfyui_gpu_type="nvidia";; -3) comfyui_gpu_type="amd";; -4) comfyui_gpu_type="intel";; -*) comfyui_gpu_type="none"; echo "${TAB3}Invalid choice. Defaulting to ${comfyui_gpu_type}." ;; +1) comfyui_gpu_type="none" ;; +2) comfyui_gpu_type="nvidia" ;; +3) comfyui_gpu_type="amd" ;; +4) comfyui_gpu_type="intel" ;; +*) + comfyui_gpu_type="none" + echo "${TAB3}Invalid choice. Defaulting to ${comfyui_gpu_type}." + ;; esac echo @@ -35,25 +38,25 @@ msg_info "Python dependencies" $STD uv venv "/opt/ComfyUI/venv" if [[ "${comfyui_gpu_type,,}" == "nvidia" ]]; then $STD uv pip install \ - torch \ - torchvision \ - torchaudio \ - --extra-index-url "https://download.pytorch.org/whl/cu128" \ - --python="/opt/ComfyUI/venv/bin/python" + torch \ + torchvision \ + torchaudio \ + --extra-index-url "https://download.pytorch.org/whl/cu128" \ + --python="/opt/ComfyUI/venv/bin/python" elif [[ "${comfyui_gpu_type,,}" == "amd" ]]; then $STD uv pip install \ - torch \ - torchvision \ - torchaudio \ - --index-url "https://download.pytorch.org/whl/rocm6.3" \ - --python="/opt/ComfyUI/venv/bin/python" + torch \ + torchvision \ + torchaudio \ + --index-url "https://download.pytorch.org/whl/rocm6.3" \ + --python="/opt/ComfyUI/venv/bin/python" elif [[ "${comfyui_gpu_type,,}" == "intel" ]]; then $STD uv pip install \ - torch \ - torchvision \ - torchaudio \ - --index-url "https://download.pytorch.org/whl/xpu" \ - --python="/opt/ComfyUI/venv/bin/python" + torch \ + torchvision \ + torchaudio \ + --index-url "https://download.pytorch.org/whl/xpu" \ + --python="/opt/ComfyUI/venv/bin/python" fi $STD uv pip install -r "/opt/ComfyUI/requirements.txt" --python="/opt/ComfyUI/venv/bin/python" msg_ok "Python dependencies" @@ -79,9 +82,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/commafeed-install.sh b/install/commafeed-install.sh index fb1154ccd..ec1daa53d 100644 --- a/install/commafeed-install.sh +++ b/install/commafeed-install.sh @@ -39,8 +39,4 @@ msg_ok "Created Service" 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/configarr-install.sh b/install/configarr-install.sh index 10edb6e5c..33ed85808 100644 --- a/install/configarr-install.sh +++ b/install/configarr-install.sh @@ -61,9 +61,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/convertx-install.sh b/install/convertx-install.sh index a01124812..0eaff99bb 100644 --- a/install/convertx-install.sh +++ b/install/convertx-install.sh @@ -75,8 +75,4 @@ msg_ok "Service Created" 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/cosmos-install.sh b/install/cosmos-install.sh index 66253623c..5aa6d5933 100644 --- a/install/cosmos-install.sh +++ b/install/cosmos-install.sh @@ -44,6 +44,7 @@ LATEST_RELEASE_NO_V=${LATEST_RELEASE#v} mv /opt/cosmos/cosmos-cloud-${LATEST_RELEASE_NO_V}/* /opt/cosmos/ rmdir /opt/cosmos/cosmos-cloud-${LATEST_RELEASE_NO_V} chmod +x /opt/cosmos/cosmos +rm -f "/opt/cosmos/cosmos-cloud-${LATEST_RELEASE#v}-amd64.zip" msg_ok "Installed Cosmos" msg_info "Creating Service" @@ -73,9 +74,4 @@ msg_info "Created Service" motd_ssh customize - -msg_info "Cleaning up" -rm -f "/opt/cosmos/cosmos-cloud-${LATEST_RELEASE#v}-amd64.zip" -$STD apt-get -y autoremove -$STD apt-get -y autoclean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/crafty-controller-install.sh b/install/crafty-controller-install.sh index 7d6493c84..83f0120ff 100644 --- a/install/crafty-controller-install.sh +++ b/install/crafty-controller-install.sh @@ -87,9 +87,4 @@ msg_ok "Crafty-Controller service started" motd_ssh customize - -msg_info "Cleaning up" -rm -rf /opt/crafty-4-v${RELEASE}.zip -$STD apt-get -y autoremove -$STD apt-get -y autoclean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/cronicle-install.sh b/install/cronicle-install.sh index 24a83b9a0..019947a2a 100644 --- a/install/cronicle-install.sh +++ b/install/cronicle-install.sh @@ -28,8 +28,4 @@ msg_ok "Configured Cronicle Primary Server" 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/cross-seed-install.sh b/install/cross-seed-install.sh index f100c0847..ad9ee8e89 100644 --- a/install/cross-seed-install.sh +++ b/install/cross-seed-install.sh @@ -39,8 +39,4 @@ msg_ok "Created Service" 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/cryptpad-install.sh b/install/cryptpad-install.sh index d7615a71b..58e94aeaf 100644 --- a/install/cryptpad-install.sh +++ b/install/cryptpad-install.sh @@ -61,8 +61,4 @@ msg_ok "Created Service" 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/daemonsync-install.sh b/install/daemonsync-install.sh index 93dc79b30..37d00de4a 100644 --- a/install/daemonsync-install.sh +++ b/install/daemonsync-install.sh @@ -20,13 +20,9 @@ msg_ok "Installed Dependencies" msg_info "Installing Daemon Sync Server" curl -fsSL "https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/tools/addon/daemonsync_2.2.0.0059_amd64.deb" -o "daemonsync_2.2.0.0059_amd64.deb" $STD dpkg -i daemonsync_2.2.0.0059_amd64.deb +rm -rf daemonsync_2.2.0.0059_amd64.deb msg_ok "Installed Daemon Sync Server" motd_ssh customize - -msg_info "Cleaning up" -rm -rf daemonsync_2.2.0.0059_amd64.deb -$STD apt-get autoremove >/dev/null -$STD apt-get autoclean >/dev/null -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/debian-install.sh b/install/debian-install.sh index 7b00ecae9..83539ab4f 100644 --- a/install/debian-install.sh +++ b/install/debian-install.sh @@ -15,10 +15,4 @@ update_os motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" - +cleanup_lxc diff --git a/install/deconz-install.sh b/install/deconz-install.sh index 04afdd0af..400f8ef1b 100644 --- a/install/deconz-install.sh +++ b/install/deconz-install.sh @@ -25,6 +25,7 @@ curl -fsSL "http://security.ubuntu.com/ubuntu/pool/main/o/openssl/$libssl" -o "$ $STD dpkg -i "$libssl" $STD apt-get update $STD apt-get install -y deconz +rm -rf "$libssl" msg_ok "Installed deConz" msg_info "Creating Service" @@ -49,9 +50,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -rm -rf "$libssl" -$STD apt-get -y autoremove -$STD apt-get -y autoclean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/deluge-install.sh b/install/deluge-install.sh index f8ebab681..df16486a0 100644 --- a/install/deluge-install.sh +++ b/install/deluge-install.sh @@ -67,8 +67,4 @@ msg_ok "Created Service" 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/dispatcharr-install.sh b/install/dispatcharr-install.sh index 69b3682ed..a968c8634 100644 --- a/install/dispatcharr-install.sh +++ b/install/dispatcharr-install.sh @@ -15,14 +15,14 @@ update_os msg_info "Installing Dependencies" $STD apt install -y \ - build-essential \ - python3-dev \ - libpq-dev \ - nginx \ - redis-server \ - ffmpeg \ - procps \ - streamlink + build-essential \ + python3-dev \ + libpq-dev \ + nginx \ + redis-server \ + ffmpeg \ + procps \ + streamlink msg_ok "Installed Dependencies" setup_uv @@ -39,11 +39,11 @@ $STD sudo -u postgres psql -c "ALTER ROLE $DB_USER SET client_encoding TO 'utf8' $STD sudo -u postgres psql -c "ALTER ROLE $DB_USER SET default_transaction_isolation TO 'read committed';" $STD sudo -u postgres psql -c "ALTER ROLE $DB_USER SET timezone TO 'UTC';" { - echo "Dispatcharr Credentials" - echo "Database Name: $DB_NAME" - echo "Database User: $DB_USER" - echo "Database Password: $DB_PASS" - echo "" + echo "Dispatcharr Credentials" + echo "Database Name: $DB_NAME" + echo "Database User: $DB_USER" + echo "Database Password: $DB_PASS" + echo "" } >>~/dispatcharr.creds msg_ok "Created PostgreSQL Database" @@ -58,9 +58,9 @@ msg_ok "Installed Python Dependencies" msg_info "Configuring Dispatcharr" install -d -m 755 \ - /data/{logos,recordings,plugins,db} \ - /data/uploads/{m3us,epgs} \ - /data/{m3us,epgs} + /data/{logos,recordings,plugins,db} \ + /data/uploads/{m3us,epgs} \ + /data/{m3us,epgs} chown -R root:root /data export DATABASE_URL="postgresql://${DB_USER}:${DB_PASS}@localhost:5432/${DB_NAME}" export POSTGRES_DB=$DB_NAME @@ -260,9 +260,4 @@ msg_ok "Created Services" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/docker-install.sh b/install/docker-install.sh index 238a84046..ae92349aa 100644 --- a/install/docker-install.sh +++ b/install/docker-install.sh @@ -69,15 +69,15 @@ fi read -r -p "${TAB3}Expose Docker TCP socket (insecure) ? [n = No, l = Local only (127.0.0.1), a = All interfaces (0.0.0.0)] : " socket_choice case "${socket_choice,,}" in - l) - socket="tcp://127.0.0.1:2375" - ;; - a) - socket="tcp://0.0.0.0:2375" - ;; - *) - socket="" - ;; +l) + socket="tcp://127.0.0.1:2375" + ;; +a) + socket="tcp://0.0.0.0:2375" + ;; +*) + socket="" + ;; esac if [[ -n "$socket" ]]; then @@ -85,10 +85,10 @@ if [[ -n "$socket" ]]; then $STD apt-get 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 + jq --arg sock "$socket" '. + { "hosts": ["unix:///var/run/docker.sock", $sock] }' /etc/docker/daemon.json >"$tmpfile" && mv "$tmpfile" /etc/docker/daemon.json mkdir -p /etc/systemd/system/docker.service.d - cat < /etc/systemd/system/docker.service.d/override.conf + cat </etc/systemd/system/docker.service.d/override.conf [Service] ExecStart= ExecStart=/usr/bin/dockerd @@ -107,8 +107,4 @@ fi 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/dockge-install.sh b/install/dockge-install.sh index 261f71603..661bd2f7c 100644 --- a/install/dockge-install.sh +++ b/install/dockge-install.sh @@ -73,8 +73,4 @@ fi 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/docmost-install.sh b/install/docmost-install.sh index 098d0837c..28aec4421 100644 --- a/install/docmost-install.sh +++ b/install/docmost-install.sh @@ -78,9 +78,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/documenso-install.sh b/install/documenso-install.sh index 9f570859f..696f4a30d 100644 --- a/install/documenso-install.sh +++ b/install/documenso-install.sh @@ -103,13 +103,9 @@ EnvironmentFile=/opt/documenso/.env WantedBy=multi-user.target EOF systemctl enable -q --now documenso +$STD turbo daemon stop msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD turbo daemon stop -$STD apt-get -y autoremove -$STD apt-get -y autoclean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/dolibarr-install.sh b/install/dolibarr-install.sh index 52c54c5b9..83addbc46 100644 --- a/install/dolibarr-install.sh +++ b/install/dolibarr-install.sh @@ -38,14 +38,10 @@ curl -fsSL "https://netcologne.dl.sourceforge.net/project/dolibarr/Dolibarr%20in echo "dolibarr dolibarr/reconfigure-webserver multiselect apache2" | debconf-set-selections $STD apt-get install ./$FILE -y $STD apt install -f +rm -rf ~/$FILE echo "${RELEASE}" >"/opt/${APPLICATION}_version.txt" msg_ok "Setup Dolibarr" motd_ssh customize - -msg_info "Cleaning up" -rm -rf ~/$FILE -$STD apt-get autoremove -$STD apt-get autoclean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/donetick-install.sh b/install/donetick-install.sh index 5bc12e07f..1b6b40652 100644 --- a/install/donetick-install.sh +++ b/install/donetick-install.sh @@ -45,10 +45,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" - +cleanup_lxc diff --git a/install/dotnetaspwebapi-install.sh b/install/dotnetaspwebapi-install.sh index 191395b03..bca3ebda3 100644 --- a/install/dotnetaspwebapi-install.sh +++ b/install/dotnetaspwebapi-install.sh @@ -105,8 +105,4 @@ msg_ok "Created Service" 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/duplicati-install.sh b/install/duplicati-install.sh index 4687d6e25..ccea87858 100644 --- a/install/duplicati-install.sh +++ b/install/duplicati-install.sh @@ -49,8 +49,4 @@ msg_ok "Created Service" 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/elementsynapse-install.sh b/install/elementsynapse-install.sh index ec8d56b53..8b0d34773 100644 --- a/install/elementsynapse-install.sh +++ b/install/elementsynapse-install.sh @@ -83,8 +83,4 @@ msg_ok "Created Service" 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/emby-install.sh b/install/emby-install.sh index 99f87b532..31b20bd1a 100644 --- a/install/emby-install.sh +++ b/install/emby-install.sh @@ -36,8 +36,4 @@ msg_ok "Configured Emby" 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/emqx-install.sh b/install/emqx-install.sh index 3592add7d..23b08a147 100644 --- a/install/emqx-install.sh +++ b/install/emqx-install.sh @@ -34,6 +34,7 @@ msg_ok "Downloaded EMQX" msg_info "Installing EMQX" $STD apt-get install -y "$DEB_FILE" +rm -f "$DEB_FILE" echo "$LATEST_VERSION" >~/.emqx msg_ok "Installed EMQX" @@ -43,9 +44,5 @@ msg_ok "Enabled EMQX service" motd_ssh customize +cleanup_lxc -msg_info "Cleaning up" -rm -f "$DEB_FILE" -$STD apt-get autoremove -$STD apt-get autoclean -msg_ok "Cleaned" diff --git a/install/ersatztv-install.sh b/install/ersatztv-install.sh index 4c930bb95..4f94f8131 100644 --- a/install/ersatztv-install.sh +++ b/install/ersatztv-install.sh @@ -78,8 +78,4 @@ msg_ok "Created Service" 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/esphome-install.sh b/install/esphome-install.sh index b3cf777be..fcb273c63 100644 --- a/install/esphome-install.sh +++ b/install/esphome-install.sh @@ -55,8 +55,4 @@ msg_ok "Created Service" 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/excalidraw-install.sh b/install/excalidraw-install.sh index 39e30bd1b..d0dc1d42d 100644 --- a/install/excalidraw-install.sh +++ b/install/excalidraw-install.sh @@ -45,8 +45,4 @@ msg_ok "Created Service" 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/fhem-install.sh b/install/fhem-install.sh index 90029e2c1..2669724d0 100644 --- a/install/fhem-install.sh +++ b/install/fhem-install.sh @@ -29,8 +29,4 @@ msg_info "Installed Fhem" 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/fileflows-install.sh b/install/fileflows-install.sh index 459f5dc8d..cd4b8f978 100644 --- a/install/fileflows-install.sh +++ b/install/fileflows-install.sh @@ -59,13 +59,9 @@ curl -fsSL https://fileflows.com/downloads/zip -o "$temp_file" $STD unzip -d /opt/fileflows "$temp_file" (cd /opt/fileflows/Server && dotnet FileFlows.Server.dll --systemd install --root true) systemctl enable -q --now fileflows +rm -f "$temp_file" msg_ok "Setup ${APPLICATION}" motd_ssh customize - -msg_info "Cleaning up" -rm -f "$temp_file" -$STD apt-get -y autoremove -$STD apt-get -y autoclean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/firefly-install.sh b/install/firefly-install.sh index f0c714e73..db3e5bd1d 100644 --- a/install/firefly-install.sh +++ b/install/firefly-install.sh @@ -55,6 +55,7 @@ tar -xzf "DataImporter-v${IMPORTER_RELEASE}.tar.gz" -C /opt/firefly/dataimporter cp /opt/firefly/dataimporter/.env.example /opt/firefly/dataimporter/.env sed -i "s#FIREFLY_III_URL=#FIREFLY_III_URL=http://${LOCAL_IP}#g" /opt/firefly/dataimporter/.env chown -R www-data:www-data /opt/firefly +rm -rf "/opt/DataImporter-v${IMPORTER_RELEASE}.tar.gz" msg_ok "Configured Firefly III" msg_info "Creating Service" @@ -95,9 +96,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -rm -rf "/opt/DataImporter-v${IMPORTER_RELEASE}.tar.gz" -$STD apt-get -y autoremove -$STD apt-get -y autoclean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/flaresolverr-install.sh b/install/flaresolverr-install.sh index ff22bcb89..9fb6a9a1f 100644 --- a/install/flaresolverr-install.sh +++ b/install/flaresolverr-install.sh @@ -57,8 +57,4 @@ msg_ok "Created Service" 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/flowiseai-install.sh b/install/flowiseai-install.sh index 585157d95..6849dfebf 100644 --- a/install/flowiseai-install.sh +++ b/install/flowiseai-install.sh @@ -44,8 +44,4 @@ msg_ok "Created Service" 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/fluid-calendar-install.sh b/install/fluid-calendar-install.sh index 687759acb..6c4b4a449 100644 --- a/install/fluid-calendar-install.sh +++ b/install/fluid-calendar-install.sh @@ -82,8 +82,4 @@ msg_ok "Created Service" 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/forgejo-install.sh b/install/forgejo-install.sh index 595790393..94e8aaa9d 100644 --- a/install/forgejo-install.sh +++ b/install/forgejo-install.sh @@ -59,8 +59,4 @@ msg_ok "Created Service" 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/freepbx-install.sh b/install/freepbx-install.sh index 887527614..28510a8d4 100644 --- a/install/freepbx-install.sh +++ b/install/freepbx-install.sh @@ -14,15 +14,11 @@ network_check update_os msg_info "Installing FreePBX (Patience)" -curl -fsSL https://github.com/FreePBX/sng_freepbx_debian_install/raw/master/sng_freepbx_debian_install.sh -o /opt/sng_freepbx_debian_install.sh +curl -fsSL https://github.com/FreePBX/sng_freepbx_debian_install/raw/master/sng_freepbx_debian_install.sh -o /opt/sng_freepbx_debian_install.sh $STD bash /opt/sng_freepbx_debian_install.sh +rm /opt/sng_freepbx_debian_install.sh msg_ok "Installed FreePBX" motd_ssh customize - -msg_info "Cleaning up" -rm /opt/sng_freepbx_debian_install.sh -$STD apt-get -y autoremove -$STD apt-get -y autoclean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/freshrss-install.sh b/install/freshrss-install.sh index 3b958c04c..6b5d6a01b 100644 --- a/install/freshrss-install.sh +++ b/install/freshrss-install.sh @@ -72,8 +72,4 @@ msg_ok "Created Service" 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/frigate-install.sh b/install/frigate-install.sh index 73b3acdf7..9853975d3 100644 --- a/install/frigate-install.sh +++ b/install/frigate-install.sh @@ -255,8 +255,4 @@ msg_ok "Configured 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/fumadocs-install.sh b/install/fumadocs-install.sh index c3bc2034a..3c5ea7fc5 100644 --- a/install/fumadocs-install.sh +++ b/install/fumadocs-install.sh @@ -47,8 +47,4 @@ msg_ok "Created Service" 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/garage-install.sh b/install/garage-install.sh index 4c51e7cdb..2c71ce437 100644 --- a/install/garage-install.sh +++ b/install/garage-install.sh @@ -59,7 +59,6 @@ metrics_token = "${METRICS_TOKEN}" EOF msg_ok "Set up Garage" - msg_info "Creating service" cat <<'EOF' >/etc/systemd/system/garage.service [Unit] @@ -87,9 +86,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/gatus-install.sh b/install/gatus-install.sh index ea3e75d45..4dbe034e1 100644 --- a/install/gatus-install.sh +++ b/install/gatus-install.sh @@ -51,8 +51,4 @@ msg_ok "Created Service" 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/ghost-install.sh b/install/ghost-install.sh index 39960ab02..1ec8c8c4f 100644 --- a/install/ghost-install.sh +++ b/install/ghost-install.sh @@ -56,9 +56,4 @@ msg_ok "Creating Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt-get -y autoremove -$STD apt-get -y autoclean -$STD apt-get -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/ghostfolio-install.sh b/install/ghostfolio-install.sh index 941571c40..2d92344b5 100644 --- a/install/ghostfolio-install.sh +++ b/install/ghostfolio-install.sh @@ -15,10 +15,10 @@ update_os msg_info "Installing Dependencies" $STD apt install -y \ - build-essential \ - openssl \ - ca-certificates \ - redis-server + build-essential \ + openssl \ + ca-certificates \ + redis-server msg_ok "Installed Dependencies" PG_VERSION="17" setup_postgresql @@ -40,13 +40,13 @@ $STD sudo -u postgres psql -d $DB_NAME -c "GRANT CREATE ON SCHEMA public TO $DB_ $STD sudo -u postgres psql -d $DB_NAME -c "ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT ALL ON TABLES TO $DB_USER;" $STD sudo -u postgres psql -d $DB_NAME -c "ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT ALL ON SEQUENCES TO $DB_USER;" { - echo "Ghostfolio Credentials" - echo "Database User: $DB_USER" - echo "Database Password: $DB_PASS" - echo "Database Name: $DB_NAME" - echo "Redis Password: $REDIS_PASS" - echo "Access Token Salt: $ACCESS_TOKEN_SALT" - echo "JWT Secret Key: $JWT_SECRET_KEY" + echo "Ghostfolio Credentials" + echo "Database User: $DB_USER" + echo "Database Password: $DB_PASS" + echo "Database Name: $DB_NAME" + echo "Redis Password: $REDIS_PASS" + echo "Access Token Salt: $ACCESS_TOKEN_SALT" + echo "JWT Secret Key: $JWT_SECRET_KEY" } >>~/ghostfolio.creds msg_ok "Set up Database" @@ -82,11 +82,11 @@ TZ=Etc/UTC EOF if [[ -n "${COINGECKO_DEMO_KEY:-}" ]]; then - echo "API_KEY_COINGECKO_DEMO=$COINGECKO_DEMO_KEY" >>/opt/ghostfolio/.env + echo "API_KEY_COINGECKO_DEMO=$COINGECKO_DEMO_KEY" >>/opt/ghostfolio/.env fi if [[ -n "${COINGECKO_PRO_KEY:-}" ]]; then - echo "API_KEY_COINGECKO_PRO=$COINGECKO_PRO_KEY" >>/opt/ghostfolio/.env + echo "API_KEY_COINGECKO_PRO=$COINGECKO_PRO_KEY" >>/opt/ghostfolio/.env fi msg_ok "Set up Environment" @@ -122,10 +122,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD npm cache clean --force -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/gitea-install.sh b/install/gitea-install.sh index 88af785f8..4339e280f 100644 --- a/install/gitea-install.sh +++ b/install/gitea-install.sh @@ -68,8 +68,4 @@ msg_ok "Created Service" 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/gitea-mirror-install.sh b/install/gitea-mirror-install.sh index 7f15bd7af..f72f7f7f2 100644 --- a/install/gitea-mirror-install.sh +++ b/install/gitea-mirror-install.sh @@ -70,8 +70,4 @@ msg_ok "Created Service" 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/glance-install.sh b/install/glance-install.sh index 23850e784..eb6ae14f9 100644 --- a/install/glance-install.sh +++ b/install/glance-install.sh @@ -60,8 +60,4 @@ msg_ok "Created Service" 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/globaleaks-install.sh b/install/globaleaks-install.sh index 8465dbbd3..911df4a8c 100644 --- a/install/globaleaks-install.sh +++ b/install/globaleaks-install.sh @@ -23,8 +23,4 @@ msg_ok "Setup GlobaLeaks" 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/glpi-install.sh b/install/glpi-install.sh index d34461ded..0d49409b7 100644 --- a/install/glpi-install.sh +++ b/install/glpi-install.sh @@ -132,6 +132,8 @@ EOF $STD a2dissite 000-default.conf $STD a2enmod rewrite $STD a2ensite glpi.conf +rm -rf /opt/glpi/install +rm -rf /opt/glpi-${RELEASE}.tgz msg_ok "Setup Service" msg_info "Setup Cronjob" @@ -152,11 +154,4 @@ msg_ok "Update PHP Params" motd_ssh customize - -msg_info "Cleaning up" -rm -rf /opt/glpi/install -rm -rf /opt/glpi-${RELEASE}.tgz -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/go2rtc-install.sh b/install/go2rtc-install.sh index 2abfd4779..0bc754f64 100644 --- a/install/go2rtc-install.sh +++ b/install/go2rtc-install.sh @@ -34,8 +34,4 @@ msg_ok "Created Service" 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/goaway-install.sh b/install/goaway-install.sh index 061ebfb7b..6066fe1e5 100644 --- a/install/goaway-install.sh +++ b/install/goaway-install.sh @@ -54,9 +54,4 @@ msg_ok "Service Created" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/gokapi-install.sh b/install/gokapi-install.sh index 272a7a05f..1fd714e8e 100644 --- a/install/gokapi-install.sh +++ b/install/gokapi-install.sh @@ -39,8 +39,4 @@ msg_ok "Created Service" 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/gotify-install.sh b/install/gotify-install.sh index 15fe235d2..86c215316 100644 --- a/install/gotify-install.sh +++ b/install/gotify-install.sh @@ -39,8 +39,4 @@ msg_ok "Created Service" 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/grist-install.sh b/install/grist-install.sh index f499b3da3..d9a52916f 100644 --- a/install/grist-install.sh +++ b/install/grist-install.sh @@ -56,8 +56,4 @@ msg_ok "Created Service" 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/grocy-install.sh b/install/grocy-install.sh index d1e888392..7359b73a1 100644 --- a/install/grocy-install.sh +++ b/install/grocy-install.sh @@ -47,8 +47,4 @@ msg_ok "Installed grocy" 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/guardian-install.sh b/install/guardian-install.sh index 994ee4407..de94d9cd4 100644 --- a/install/guardian-install.sh +++ b/install/guardian-install.sh @@ -67,9 +67,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/heimdall-dashboard-install.sh b/install/heimdall-dashboard-install.sh index 4b823279e..a2e0ed1fe 100644 --- a/install/heimdall-dashboard-install.sh +++ b/install/heimdall-dashboard-install.sh @@ -57,8 +57,4 @@ msg_ok "Created Service" 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/hev-socks5-server-install.sh b/install/hev-socks5-server-install.sh index a3c527f40..65d294489 100644 --- a/install/hev-socks5-server-install.sh +++ b/install/hev-socks5-server-install.sh @@ -47,8 +47,4 @@ msg_ok "Created Service" 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/homepage-install.sh b/install/homepage-install.sh index 303648aa3..501ec9aad 100644 --- a/install/homepage-install.sh +++ b/install/homepage-install.sh @@ -61,8 +61,4 @@ msg_ok "Created Service" 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/homer-install.sh b/install/homer-install.sh index 525dd3a4f..7787f5929 100644 --- a/install/homer-install.sh +++ b/install/homer-install.sh @@ -43,8 +43,4 @@ msg_ok "Created Service" 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/inventree-install.sh b/install/inventree-install.sh index aba26f1be..61af0723c 100644 --- a/install/inventree-install.sh +++ b/install/inventree-install.sh @@ -17,6 +17,7 @@ msg_info "Installing Dependencies" temp_file=$(mktemp) curl -fsSL "http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2_amd64.deb" -o "$temp_file" $STD dpkg -i $temp_file +rm -f $temp_file msg_ok "Installed Dependencies" msg_info "Setting up InvenTree Repository" @@ -32,9 +33,4 @@ msg_ok "Setup ${APPLICATION}" motd_ssh customize - -msg_info "Cleaning up" -rm -f $temp_file -$STD apt-get -y autoremove -$STD apt-get -y autoclean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/iventoy-install.sh b/install/iventoy-install.sh index 240984075..4789ae1cb 100644 --- a/install/iventoy-install.sh +++ b/install/iventoy-install.sh @@ -45,8 +45,4 @@ msg_ok "Created Service" 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/jellyseerr-install.sh b/install/jellyseerr-install.sh index 80733da9f..81980d783 100644 --- a/install/jellyseerr-install.sh +++ b/install/jellyseerr-install.sh @@ -61,8 +61,4 @@ msg_ok "Created Service" 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/lazylibrarian-install.sh b/install/lazylibrarian-install.sh index 2c746172f..c1ee8e2a6 100644 --- a/install/lazylibrarian-install.sh +++ b/install/lazylibrarian-install.sh @@ -59,9 +59,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/leantime-install.sh b/install/leantime-install.sh index 2651b2ae9..14c71a81f 100644 --- a/install/leantime-install.sh +++ b/install/leantime-install.sh @@ -71,9 +71,4 @@ msg_ok "Setup leantime" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/librespeed-rust-install.sh b/install/librespeed-rust-install.sh index 9d04fa03f..a2c0d2c7f 100644 --- a/install/librespeed-rust-install.sh +++ b/install/librespeed-rust-install.sh @@ -21,9 +21,4 @@ msg_ok "Enabled Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/libretranslate-install.sh b/install/libretranslate-install.sh index eda190d6a..47e55b66d 100644 --- a/install/libretranslate-install.sh +++ b/install/libretranslate-install.sh @@ -36,7 +36,7 @@ setup_uv fetch_and_deploy_gh_release "libretranslate" "LibreTranslate/LibreTranslate" msg_info "Setup LibreTranslate (Patience)" -TORCH_VERSION=$(grep -Eo '"torch ==[0-9]+\.[0-9]+\.[0-9]+' /opt/libretranslate/pyproject.toml | \ +TORCH_VERSION=$(grep -Eo '"torch ==[0-9]+\.[0-9]+\.[0-9]+' /opt/libretranslate/pyproject.toml | tail -n1 | sed 's/.*==//') if [[ -z "$TORCH_VERSION" ]]; then TORCH_VERSION="2.5.0" @@ -83,9 +83,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/lidarr-install.sh b/install/lidarr-install.sh index 8e675e6af..01bb6e04d 100644 --- a/install/lidarr-install.sh +++ b/install/lidarr-install.sh @@ -50,9 +50,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/limesurvey-install.sh b/install/limesurvey-install.sh index 2f619776a..2609dc07a 100644 --- a/install/limesurvey-install.sh +++ b/install/limesurvey-install.sh @@ -24,10 +24,10 @@ $STD mariadb -u root -e "CREATE DATABASE $DB_NAME CHARACTER SET utf8mb4 COLLATE $STD mariadb -u root -e "CREATE USER '$DB_USER'@'localhost' IDENTIFIED BY '$DB_PASS';" $STD mariadb -u root -e "GRANT ALL ON $DB_NAME.* TO '$DB_USER'@'localhost'; FLUSH PRIVILEGES;" { - echo "LimeSurvey-Credentials" - echo "LimeSurvey Database User: $DB_USER" - echo "LimeSurvey Database Password: $DB_PASS" - echo "LimeSurvey Database Name: $DB_NAME" + echo "LimeSurvey-Credentials" + echo "LimeSurvey Database User: $DB_USER" + echo "LimeSurvey Database Password: $DB_PASS" + echo "LimeSurvey Database Name: $DB_NAME" } >>~/limesurvey.creds msg_ok "Configured MariaDB Database" @@ -61,14 +61,9 @@ EOF chown -R www-data:www-data "/opt/limesurvey" chmod -R 750 "/opt/limesurvey" systemctl reload apache2 +rm -rf "$temp_file" msg_ok "Set up LimeSurvey" motd_ssh customize - -msg_info "Cleaning up" -rm -rf "$temp_file" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/linkstack-install.sh b/install/linkstack-install.sh index 3b01aad1e..8db7b1471 100644 --- a/install/linkstack-install.sh +++ b/install/linkstack-install.sh @@ -41,9 +41,4 @@ msg_ok "Configured LinkStack" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/linkwarden-install.sh b/install/linkwarden-install.sh index 0bbb7e13a..4c875669f 100644 --- a/install/linkwarden-install.sh +++ b/install/linkwarden-install.sh @@ -62,6 +62,9 @@ EOF $STD yarn prisma:generate $STD yarn web:build $STD yarn prisma:deploy +rm -rf ~/.cargo/registry ~/.cargo/git ~/.cargo/.package-cache ~/.rustup +rm -rf /root/.cache/yarn +rm -rf /opt/linkwarden/.next/cache msg_ok "Installed Linkwarden" msg_info "Creating Service" @@ -84,12 +87,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -rm -rf ~/.cargo/registry ~/.cargo/git ~/.cargo/.package-cache ~/.rustup -rm -rf /root/.cache/yarn -rm -rf /opt/linkwarden/.next/cache -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/listmonk-install.sh b/install/listmonk-install.sh index 09ddafd1b..1fa7f9c85 100644 --- a/install/listmonk-install.sh +++ b/install/listmonk-install.sh @@ -60,9 +60,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/litellm-install.sh b/install/litellm-install.sh index d65b7b97b..8d2a6b643 100644 --- a/install/litellm-install.sh +++ b/install/litellm-install.sh @@ -79,9 +79,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/livebook-install.sh b/install/livebook-install.sh index 1d24e25eb..27c316355 100644 --- a/install/livebook-install.sh +++ b/install/livebook-install.sh @@ -98,9 +98,4 @@ msg_ok "Installed Livebook" motd_ssh customize - -msg_info "Cleaning Up" -$STD apt autoremove -y -$STD apt autoclean -y -$STD apt clean -y -msg_ok "Cleaned Up" +cleanup_lxc diff --git a/install/lldap-install.sh b/install/lldap-install.sh index b9abeca76..bcfee5972 100644 --- a/install/lldap-install.sh +++ b/install/lldap-install.sh @@ -36,9 +36,4 @@ msg_ok "Installed lldap" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/lubelogger-install.sh b/install/lubelogger-install.sh index 5081c099f..ff7dc5839 100644 --- a/install/lubelogger-install.sh +++ b/install/lubelogger-install.sh @@ -20,6 +20,7 @@ cd /opt/lubelogger chmod 700 /opt/lubelogger/CarCareTracker cp /opt/lubelogger/appsettings.json /opt/lubelogger/appsettings_bak.json jq '.Kestrel = {"Endpoints": {"Http": {"Url": "http://0.0.0.0:5000"}}}' /opt/lubelogger/appsettings_bak.json >/opt/lubelogger/appsettings.json +rm -rf /opt/lubelogger/appsettings_bak.json msg_ok "Configured LubeLogger" msg_info "Creating Service" @@ -47,10 +48,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -rm -rf /opt/lubelogger/appsettings_bak.json -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/lyrionmusicserver-install.sh b/install/lyrionmusicserver-install.sh index 3bb35993c..4e7530ae8 100644 --- a/install/lyrionmusicserver-install.sh +++ b/install/lyrionmusicserver-install.sh @@ -19,15 +19,10 @@ RELEASE=$(echo "$DEB_URL" | grep -oP 'lyrionmusicserver_\K[0-9.]+(?=_amd64\.deb) DEB_FILE="/tmp/lyrionmusicserver_${RELEASE}_amd64.deb" curl -fsSL -o "$DEB_FILE" "$DEB_URL" $STD apt install "$DEB_FILE" -y +rm -f "$DEB_FILE" echo "${RELEASE}" >"/opt/lyrion_version.txt" msg_ok "Setup Lyrion Music Server v${RELEASE}" motd_ssh customize - -msg_info "Cleaning up" -$STD rm -f "$DEB_FILE" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/mafl-install.sh b/install/mafl-install.sh index d49d639ac..1e5512f29 100644 --- a/install/mafl-install.sh +++ b/install/mafl-install.sh @@ -54,9 +54,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/magicmirror-install.sh b/install/magicmirror-install.sh index df46dbfa7..899379850 100644 --- a/install/magicmirror-install.sh +++ b/install/magicmirror-install.sh @@ -134,9 +134,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/managemydamnlife-install.sh b/install/managemydamnlife-install.sh index 10eefdf90..d730a86cf 100644 --- a/install/managemydamnlife-install.sh +++ b/install/managemydamnlife-install.sh @@ -75,9 +75,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/mariadb-install.sh b/install/mariadb-install.sh index 1c1e551be..1b67defdf 100644 --- a/install/mariadb-install.sh +++ b/install/mariadb-install.sh @@ -47,9 +47,4 @@ fi motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/matterbridge-install.sh b/install/matterbridge-install.sh index eb28fcb06..446a9a164 100644 --- a/install/matterbridge-install.sh +++ b/install/matterbridge-install.sh @@ -44,9 +44,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/mattermost-install.sh b/install/mattermost-install.sh index b7db6573f..d34fda608 100644 --- a/install/mattermost-install.sh +++ b/install/mattermost-install.sh @@ -57,9 +57,4 @@ msg_ok "Installed Mattermost" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/mealie-install.sh b/install/mealie-install.sh index a52c890a4..2f551fdd3 100644 --- a/install/mealie-install.sh +++ b/install/mealie-install.sh @@ -141,9 +141,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/mediamanager-install.sh b/install/mediamanager-install.sh index 6e4035102..c379aab5c 100644 --- a/install/mediamanager-install.sh +++ b/install/mediamanager-install.sh @@ -110,9 +110,4 @@ msg_ok "Created service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/mediamtx-install.sh b/install/mediamtx-install.sh index ef427eee6..c1bfc51eb 100644 --- a/install/mediamtx-install.sh +++ b/install/mediamtx-install.sh @@ -38,9 +38,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/medusa-install.sh b/install/medusa-install.sh index d8ca6e3c7..667d85352 100644 --- a/install/medusa-install.sh +++ b/install/medusa-install.sh @@ -52,9 +52,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/meilisearch-install.sh b/install/meilisearch-install.sh index eada693b8..32c044850 100644 --- a/install/meilisearch-install.sh +++ b/install/meilisearch-install.sh @@ -88,9 +88,4 @@ msg_ok "Service created" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/memos-install.sh b/install/memos-install.sh index 9b26a7770..dac83d98f 100644 --- a/install/memos-install.sh +++ b/install/memos-install.sh @@ -39,9 +39,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/meshcentral-install.sh b/install/meshcentral-install.sh index 2ab07b0e5..074ce68cd 100644 --- a/install/meshcentral-install.sh +++ b/install/meshcentral-install.sh @@ -28,9 +28,4 @@ msg_ok "Installed MeshCentral" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/minarca-install.sh b/install/minarca-install.sh index f2ea0f0a5..f66cb03d7 100644 --- a/install/minarca-install.sh +++ b/install/minarca-install.sh @@ -36,9 +36,4 @@ msg_ok "Installed Minarca" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/minio-install.sh b/install/minio-install.sh index 719f0385a..585cc11df 100644 --- a/install/minio-install.sh +++ b/install/minio-install.sh @@ -92,9 +92,4 @@ msg_ok "Service created" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleanup complete" +cleanup_lxc diff --git a/install/monica-install.sh b/install/monica-install.sh index 797037e34..4503036db 100644 --- a/install/monica-install.sh +++ b/install/monica-install.sh @@ -76,9 +76,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/motioneye-install.sh b/install/motioneye-install.sh index f2107d3d8..ad69f5918 100644 --- a/install/motioneye-install.sh +++ b/install/motioneye-install.sh @@ -53,9 +53,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/mqtt-install.sh b/install/mqtt-install.sh index b448e332f..3d63a537c 100644 --- a/install/mqtt-install.sh +++ b/install/mqtt-install.sh @@ -28,9 +28,4 @@ msg_ok "Installed Mosquitto MQTT Broker" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/myip-install.sh b/install/myip-install.sh index 59d35bcdb..5dfc69d48 100644 --- a/install/myip-install.sh +++ b/install/myip-install.sh @@ -46,9 +46,4 @@ msg_ok "Service created" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/mylar3-install.sh b/install/mylar3-install.sh index bcb866894..7287d1b1e 100644 --- a/install/mylar3-install.sh +++ b/install/mylar3-install.sh @@ -55,9 +55,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/myspeed-install.sh b/install/myspeed-install.sh index 5ffeb29b2..aa040d14b 100644 --- a/install/myspeed-install.sh +++ b/install/myspeed-install.sh @@ -50,9 +50,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/mysql-install.sh b/install/mysql-install.sh index 404f2957d..7c4cfca16 100644 --- a/install/mysql-install.sh +++ b/install/mysql-install.sh @@ -72,9 +72,4 @@ msg_ok "Service started" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/n8n-install.sh b/install/n8n-install.sh index c9cd5efaa..d78ebcc28 100644 --- a/install/n8n-install.sh +++ b/install/n8n-install.sh @@ -55,9 +55,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/navidrome-install.sh b/install/navidrome-install.sh index a2a4a8313..0dec37fc2 100644 --- a/install/navidrome-install.sh +++ b/install/navidrome-install.sh @@ -30,9 +30,4 @@ fi motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/neo4j-install.sh b/install/neo4j-install.sh index b0c9ba4b7..96e056a56 100644 --- a/install/neo4j-install.sh +++ b/install/neo4j-install.sh @@ -27,9 +27,4 @@ msg_ok "Installed Neo4j" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/netbox-install.sh b/install/netbox-install.sh index 12971ccd5..9f5769828 100644 --- a/install/netbox-install.sh +++ b/install/netbox-install.sh @@ -86,7 +86,7 @@ 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 - +rm "/opt/v${RELEASE}.zip" echo "${RELEASE}" >/opt/"${APPLICATION}"_version.txt echo -e "Netbox Secret: \e[32m$SECRET_KEY\e[0m" >>~/netbox.creds msg_ok "Installed NetBox" @@ -114,10 +114,4 @@ msg_ok "Setup Django Admin" motd_ssh customize - -msg_info "Cleaning up" -rm "/opt/v${RELEASE}.zip" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/nextcloudpi-install.sh b/install/nextcloudpi-install.sh index 12bcad381..5159273dd 100644 --- a/install/nextcloudpi-install.sh +++ b/install/nextcloudpi-install.sh @@ -30,9 +30,4 @@ msg_ok "Installed NextCloudPi" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/nextpvr-install.sh b/install/nextpvr-install.sh index 8240acc36..d87a7d2ac 100644 --- a/install/nextpvr-install.sh +++ b/install/nextpvr-install.sh @@ -31,13 +31,9 @@ msg_info "Setup NextPVR (Patience)" cd /opt curl -fsSL "https://nextpvr.com/nextpvr-helper.deb" -o "/opt/nextpvr-helper.deb" $STD dpkg -i nextpvr-helper.deb +rm -rf /opt/nextpvr-helper.deb msg_ok "Installed NextPVR" motd_ssh customize - -msg_info "Cleaning up" -rm -rf /opt/nextpvr-helper.deb -$STD apt autoremove -$STD apt autoclean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/nginxproxymanager-install.sh b/install/nginxproxymanager-install.sh index 848485a41..82ff73728 100644 --- a/install/nginxproxymanager-install.sh +++ b/install/nginxproxymanager-install.sh @@ -168,14 +168,9 @@ sed -i 's/user npm/user root/g; s/^pid/#pid/g' /usr/local/openresty/nginx/conf/n sed -r -i 's/^([[:space:]]*)su npm npm/\1#su npm npm/g;' /etc/logrotate.d/nginx-proxy-manager systemctl enable -q --now openresty systemctl enable -q --now npm +systemctl restart openresty msg_ok "Started Services" motd_ssh customize - -msg_info "Cleaning up" -systemctl restart openresty -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/nocodb-install.sh b/install/nocodb-install.sh index 085b00ad0..cde1d0f16 100644 --- a/install/nocodb-install.sh +++ b/install/nocodb-install.sh @@ -35,9 +35,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/node-red-install.sh b/install/node-red-install.sh index 9e9e3385a..bc0096d8b 100644 --- a/install/node-red-install.sh +++ b/install/node-red-install.sh @@ -58,9 +58,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/nodebb-install.sh b/install/nodebb-install.sh index 7b5514843..3823d59a0 100644 --- a/install/nodebb-install.sh +++ b/install/nodebb-install.sh @@ -130,9 +130,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/notifiarr-install.sh b/install/notifiarr-install.sh index 9fa8f1bd1..2556efcb3 100644 --- a/install/notifiarr-install.sh +++ b/install/notifiarr-install.sh @@ -30,9 +30,4 @@ msg_ok "Installed Notifiarr" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/ntfy-install.sh b/install/ntfy-install.sh index d8c6baee1..4debed9b4 100644 --- a/install/ntfy-install.sh +++ b/install/ntfy-install.sh @@ -16,7 +16,7 @@ update_os msg_info "Installing ntfy" mkdir -p /etc/apt/keyrings curl -fsSL -o /etc/apt/keyrings/ntfy.gpg https://archive.ntfy.sh/apt/keyring.gpg -cat </etc/apt/sources.list.d/ntfy.sources +cat </etc/apt/sources.list.d/ntfy.sources Types: deb URIs: https://archive.ntfy.sh/apt/ Suites: stable @@ -31,9 +31,4 @@ msg_ok "Installed ntfy" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/nxwitness-install.sh b/install/nxwitness-install.sh index ca6c3db70..573f47fe3 100644 --- a/install/nxwitness-install.sh +++ b/install/nxwitness-install.sh @@ -33,15 +33,10 @@ DOWNLOAD_URL=$(echo "$DETAIL_PAGE" | grep -oP "https://updates.networkoptix.com/ curl -fsSL "$DOWNLOAD_URL" -o ""nxwitness-server-$RELEASE-linux_x64.deb"" export DEBIAN_FRONTEND=noninteractive $STD dpkg -i nxwitness-server-$RELEASE-linux_x64.deb +rm -f /tmp/nxwitness-server-$RELEASE-linux_x64.deb echo "${RELEASE}" >/opt/${APPLICATION}_version.txt msg_ok "Setup Nx Witness" motd_ssh customize - -msg_info "Cleaning up" -rm -f /tmp/nxwitness-server-$RELEASE-linux_x64.deb -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/nzbget-install.sh b/install/nzbget-install.sh index 3e5a8d690..81f994ab8 100644 --- a/install/nzbget-install.sh +++ b/install/nzbget-install.sh @@ -43,9 +43,4 @@ msg_ok "Installed NZBGet" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/oauth2-proxy-install.sh b/install/oauth2-proxy-install.sh index dbd79e247..a9d5af78f 100644 --- a/install/oauth2-proxy-install.sh +++ b/install/oauth2-proxy-install.sh @@ -37,9 +37,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/octoprint-install.sh b/install/octoprint-install.sh index 15effc3a0..21c5018d7 100644 --- a/install/octoprint-install.sh +++ b/install/octoprint-install.sh @@ -70,9 +70,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/odoo-install.sh b/install/odoo-install.sh index 4dbfdd9b4..e044e7e24 100644 --- a/install/odoo-install.sh +++ b/install/odoo-install.sh @@ -58,6 +58,8 @@ sed -i \ -e "s|^;*db_password *=.*|db_password = $DB_PASS|" \ /etc/odoo/odoo.conf $STD sudo -u odoo odoo -c /etc/odoo/odoo.conf -d odoo -i base --stop-after-init +rm -f /opt/odoo.deb +rm -f /opt/python3-lxml-html-clean.deb echo "${LATEST_VERSION}" >/opt/${APPLICATION}_version.txt msg_ok "Configured Odoo" @@ -67,11 +69,4 @@ msg_ok "Restarted Odoo" motd_ssh customize - -msg_info "Cleaning up" -rm -f /opt/odoo.deb -rm -f /opt/python3-lxml-html-clean.deb -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/ollama-install.sh b/install/ollama-install.sh index 8e9242b88..f9e7fabd9 100644 --- a/install/ollama-install.sh +++ b/install/ollama-install.sh @@ -113,9 +113,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/ombi-install.sh b/install/ombi-install.sh index b35e61793..5268a3b0b 100644 --- a/install/ombi-install.sh +++ b/install/ombi-install.sh @@ -34,9 +34,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/omv-install.sh b/install/omv-install.sh index d25c9eb11..bfd879e30 100644 --- a/install/omv-install.sh +++ b/install/omv-install.sh @@ -29,9 +29,4 @@ msg_ok "Installed OpenMediaVault" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/onedev-install.sh b/install/onedev-install.sh index 46c32e994..360070c92 100644 --- a/install/onedev-install.sh +++ b/install/onedev-install.sh @@ -28,15 +28,10 @@ mv /opt/onedev-latest /opt/onedev $STD /opt/onedev/bin/server.sh install systemctl start onedev RELEASE=$(cat /opt/onedev/release.properties | grep "version" | cut -d'=' -f2) +rm -rf /opt/onedev-latest.tar.gz echo "${RELEASE}" >"/opt/${APPLICATION}_version.txt" msg_ok "Installed OneDev" motd_ssh customize - -msg_info "Cleaning up" -rm -rf /opt/onedev-latest.tar.gz -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/onlyoffice-install.sh b/install/onlyoffice-install.sh index 4eb8d374e..d63fda91f 100644 --- a/install/onlyoffice-install.sh +++ b/install/onlyoffice-install.sh @@ -104,9 +104,4 @@ msg_ok "ONLYOFFICE Docs Installed" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/open-archiver-install.sh b/install/open-archiver-install.sh index 126c46c16..b0c484c05 100644 --- a/install/open-archiver-install.sh +++ b/install/open-archiver-install.sh @@ -88,7 +88,7 @@ sed -i "s|^STORAGE_LOCAL_ROOT_PATH=.*|STORAGE_LOCAL_ROOT_PATH=/opt/openarchiver- sed -i "s|^JWT_SECRET=.*|JWT_SECRET=$JWT_KEY|g" /opt/openarchiver/.env sed -i "s|^ENCRYPTION_KEY=.*|ENCRYPTION_KEY=$SECRET_KEY|g" /opt/openarchiver/.env sed -i "s|^TIKA_URL=.*|TIKA_URL=|g" /opt/openarchiver/.env -echo "ORIGIN=http://$IP_ADDR:3000" >> /opt/openarchiver/.env +echo "ORIGIN=http://$IP_ADDR:3000" >>/opt/openarchiver/.env $STD pnpm install --shamefully-hoist --frozen-lockfile --prod=false $STD pnpm run build:oss $STD pnpm db:migrate @@ -116,9 +116,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/opengist-install.sh b/install/opengist-install.sh index 25f5b625e..944e7662a 100644 --- a/install/opengist-install.sh +++ b/install/opengist-install.sh @@ -41,9 +41,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/openobserve-install.sh b/install/openobserve-install.sh index 0cd29e072..cc520f84a 100644 --- a/install/openobserve-install.sh +++ b/install/openobserve-install.sh @@ -47,9 +47,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/openproject-install.sh b/install/openproject-install.sh index f06bf714e..d5dc8d43b 100644 --- a/install/openproject-install.sh +++ b/install/openproject-install.sh @@ -81,9 +81,4 @@ msg_ok "Configured OpenProject" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/openziti-controller-install.sh b/install/openziti-controller-install.sh index 6e6c6989f..bfd47257f 100644 --- a/install/openziti-controller-install.sh +++ b/install/openziti-controller-install.sh @@ -55,9 +55,4 @@ fi motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/openziti-tunnel-install.sh b/install/openziti-tunnel-install.sh index 0090c6ccd..68c4bd037 100644 --- a/install/openziti-tunnel-install.sh +++ b/install/openziti-tunnel-install.sh @@ -43,9 +43,4 @@ fi motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/ots-install.sh b/install/ots-install.sh index 0c0de290d..f95a32b61 100644 --- a/install/ots-install.sh +++ b/install/ots-install.sh @@ -15,9 +15,9 @@ update_os msg_info "Installing Dependencies" $STD apt install -y \ - redis-server \ - nginx \ - openssl + redis-server \ + nginx \ + openssl msg_ok "Installed Dependencies" fetch_and_deploy_gh_release "ots" "Luzifer/ots" "prebuild" "latest" "/opt/ots" "ots_linux_amd64.tgz" @@ -34,9 +34,9 @@ msg_ok "Setup OTS" msg_info "Generating Universal SSL Certificate" mkdir -p /etc/ssl/ots $STD openssl req -x509 -nodes -days 3650 -newkey rsa:2048 \ - -keyout /etc/ssl/ots/key.pem \ - -out /etc/ssl/ots/cert.pem \ - -subj "/CN=ots" + -keyout /etc/ssl/ots/key.pem \ + -out /etc/ssl/ots/cert.pem \ + -subj "/CN=ots" msg_ok "Certificate Generated" msg_info "Setting up nginx" @@ -96,9 +96,4 @@ msg_ok "Created Services" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/outline-install.sh b/install/outline-install.sh index 932123eef..476bae274 100644 --- a/install/outline-install.sh +++ b/install/outline-install.sh @@ -83,9 +83,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/overseerr-install.sh b/install/overseerr-install.sh index 52343f602..abab0640d 100644 --- a/install/overseerr-install.sh +++ b/install/overseerr-install.sh @@ -45,9 +45,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/owncast-install.sh b/install/owncast-install.sh index c54a618bb..fd12c0775 100644 --- a/install/owncast-install.sh +++ b/install/owncast-install.sh @@ -38,9 +38,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/pairdrop-install.sh b/install/pairdrop-install.sh index 51cca0cb4..401ec102b 100644 --- a/install/pairdrop-install.sh +++ b/install/pairdrop-install.sh @@ -40,9 +40,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/palmr-install.sh b/install/palmr-install.sh index 0fd90a550..f58e8bd2d 100644 --- a/install/palmr-install.sh +++ b/install/palmr-install.sh @@ -88,9 +88,4 @@ msg_ok "Created service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/pangolin-install.sh b/install/pangolin-install.sh index 8581e2f6c..db60cd39e 100644 --- a/install/pangolin-install.sh +++ b/install/pangolin-install.sh @@ -245,9 +245,4 @@ msg_ok "Created Services" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/paperless-ai-install.sh b/install/paperless-ai-install.sh index c66b345bc..d382c1c00 100644 --- a/install/paperless-ai-install.sh +++ b/install/paperless-ai-install.sh @@ -61,6 +61,7 @@ CUSTOM_MODEL= RAG_SERVICE_URL=http://localhost:8000 RAG_SERVICE_ENABLED=true EOF +rm -rf v${RELEASE}.zip echo "${RELEASE}" >"/opt/${APPLICATION}_version.txt" msg_ok "Setup Paperless-AI" @@ -100,10 +101,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -rm -rf /opt/v${RELEASE}.zip -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/paperless-gpt-install.sh b/install/paperless-gpt-install.sh index 0607e54c6..55dccecd3 100644 --- a/install/paperless-gpt-install.sh +++ b/install/paperless-gpt-install.sh @@ -40,6 +40,7 @@ go mod download export CC=musl-gcc CGO_ENABLED=1 go build -tags musl -o /dev/null github.com/mattn/go-sqlite3 CGO_ENABLED=1 go build -tags musl -o paperless-gpt . +rm -f "$temp_file" echo "${RELEASE}" >"/opt/${APPLICATION}_version.txt" msg_ok "Setup Paperless-GPT" @@ -107,10 +108,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -rm -f "$temp_file" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/part-db-install.sh b/install/part-db-install.sh index 312e0e56c..ad8b28df7 100644 --- a/install/part-db-install.sh +++ b/install/part-db-install.sh @@ -62,6 +62,8 @@ ADMIN_PASS=$(grep -oP 'The initial password for the "admin" user is: \K\w+' ~/da echo "Part-DB Admin User: admin" echo "Part-DB Admin Password: $ADMIN_PASS" } >>~/partdb.creds +rm -rf ~/database-migration-output +rm -rf "/opt/v${RELEASE}.zip" echo "${RELEASE}" >/opt/${APPLICATION}_version.txt msg_ok "Installed Part-DB" @@ -88,11 +90,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -rm -rf ~/database-migration-output -rm -rf "/opt/v${RELEASE}.zip" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/patchmon-install.sh b/install/patchmon-install.sh index b2c948787..7c67adaff 100644 --- a/install/patchmon-install.sh +++ b/install/patchmon-install.sh @@ -279,9 +279,4 @@ msg_ok "Settings updated successfully" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/paymenter-install.sh b/install/paymenter-install.sh index 0b302bd81..7a15d6cff 100644 --- a/install/paymenter-install.sh +++ b/install/paymenter-install.sh @@ -114,10 +114,4 @@ msg_ok "Setup Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" - +cleanup_lxc diff --git a/install/peanut-install.sh b/install/peanut-install.sh index 5bef1e853..b4cd6ab5a 100644 --- a/install/peanut-install.sh +++ b/install/peanut-install.sh @@ -63,9 +63,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/pelican-panel-install.sh b/install/pelican-panel-install.sh index ed2abfa5a..51247aa5f 100644 --- a/install/pelican-panel-install.sh +++ b/install/pelican-panel-install.sh @@ -70,6 +70,7 @@ $STD php artisan p:environment:queue-service --no-interaction echo "* * * * * php /opt/pelican-panel/artisan schedule:run >> /dev/null 2>&1" | crontab -u www-data - chown -R www-data:www-data /opt/pelican-panel chmod -R 755 /opt/pelican-panel/storage /opt/pelican-panel/bootstrap/cache/ +rm -rf "/opt/pelican-panel/panel.tar.gz" echo "${RELEASE}" >/opt/"${APPLICATION}"_version.txt msg_ok "Installed Pelican Panel" @@ -100,10 +101,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -rm -rf "/opt/pelican-panel/panel.tar.gz" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/pelican-wings-install.sh b/install/pelican-wings-install.sh index 06e670e30..cb848381a 100644 --- a/install/pelican-wings-install.sh +++ b/install/pelican-wings-install.sh @@ -56,9 +56,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/pf2etools-install.sh b/install/pf2etools-install.sh index ab3bce602..e07225aed 100644 --- a/install/pf2etools-install.sh +++ b/install/pf2etools-install.sh @@ -42,12 +42,6 @@ ln -s "/opt/Pf2eTools" /var/www/html chown -R www-data: "/opt/Pf2eTools" chmod -R 755 "/opt/Pf2eTools" msg_ok "Created Service" - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" - +cleanup_lxc motd_ssh customize diff --git a/install/photoprism-install.sh b/install/photoprism-install.sh index 0714b8169..175574ebe 100644 --- a/install/photoprism-install.sh +++ b/install/photoprism-install.sh @@ -154,9 +154,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/pialert-install.sh b/install/pialert-install.sh index cde80fb64..8d639d0f9 100644 --- a/install/pialert-install.sh +++ b/install/pialert-install.sh @@ -99,9 +99,4 @@ msg_ok "Finished Pi.Alert Scan" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/pihole-install.sh b/install/pihole-install.sh index 1b2fc457e..e5eff2e60 100644 --- a/install/pihole-install.sh +++ b/install/pihole-install.sh @@ -156,9 +156,4 @@ fi motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/planka-install.sh b/install/planka-install.sh index 969fea20d..5017f1238 100644 --- a/install/planka-install.sh +++ b/install/planka-install.sh @@ -96,9 +96,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/plant-it-install.sh b/install/plant-it-install.sh index 29e81ac07..07492b0f4 100644 --- a/install/plant-it-install.sh +++ b/install/plant-it-install.sh @@ -15,8 +15,8 @@ update_os msg_info "Installing Dependencies" $STD apt install -y \ - redis \ - nginx + redis \ + nginx msg_ok "Installed Dependencies" setup_mariadb @@ -31,10 +31,10 @@ $STD mariadb -u root -e "CREATE DATABASE $DB_NAME;" $STD mariadb -u root -e "CREATE USER '$DB_USER'@'localhost' IDENTIFIED BY '$DB_PASS';" $STD mariadb -u root -e "GRANT ALL ON $DB_NAME.* TO '$DB_USER'@'localhost'; FLUSH PRIVILEGES;" { - echo "Plant-it Credentials" - echo "Plant-it Database User: $DB_USER" - echo "Plant-it Database Password: $DB_PASS" - echo "Plant-it Database Name: $DB_NAME" + echo "Plant-it Credentials" + echo "Plant-it Database User: $DB_USER" + echo "Plant-it Database Password: $DB_PASS" + echo "Plant-it Database Name: $DB_NAME" } >>~/plant-it.creds msg_ok "Set up MariaDB" @@ -117,9 +117,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/plex-install.sh b/install/plex-install.sh index d3005d417..a12ba3fee 100644 --- a/install/plex-install.sh +++ b/install/plex-install.sh @@ -47,9 +47,4 @@ msg_ok "Installed Plex Media Server" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/pocketbase-install.sh b/install/pocketbase-install.sh index 7acaed324..ec82fe6a6 100644 --- a/install/pocketbase-install.sh +++ b/install/pocketbase-install.sh @@ -41,9 +41,4 @@ msg_ok "Service created" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/pocketid-install.sh b/install/pocketid-install.sh index e1c774f1b..b9e9e204d 100644 --- a/install/pocketid-install.sh +++ b/install/pocketid-install.sh @@ -54,9 +54,4 @@ msg_ok "Started Services" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/podman-homeassistant-install.sh b/install/podman-homeassistant-install.sh index 83065a2e0..0e89adc40 100644 --- a/install/podman-homeassistant-install.sh +++ b/install/podman-homeassistant-install.sh @@ -102,9 +102,4 @@ msg_ok "Installed Home Assistant" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/podman-install.sh b/install/podman-install.sh index cb8d2221f..4e10b5c1e 100644 --- a/install/podman-install.sh +++ b/install/podman-install.sh @@ -81,9 +81,4 @@ fi motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/postgresql-install.sh b/install/postgresql-install.sh index 085178f69..a59e56425 100644 --- a/install/postgresql-install.sh +++ b/install/postgresql-install.sh @@ -14,7 +14,10 @@ network_check update_os read -r -p "${TAB3}Enter PostgreSQL version (15/16/17/18): " ver -[[ $ver =~ ^(15|16|17|18)$ ]] || { echo "Invalid version"; exit 1; } +[[ $ver =~ ^(15|16|17|18)$ ]] || { + echo "Invalid version" + exit 1 +} PG_VERSION=$ver setup_postgresql cat </etc/postgresql/$ver/main/pg_hba.conf @@ -131,9 +134,4 @@ fi motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/privatebin-install.sh b/install/privatebin-install.sh index 69dff317e..7aceb5f8b 100644 --- a/install/privatebin-install.sh +++ b/install/privatebin-install.sh @@ -15,8 +15,8 @@ update_os msg_info "Installing Dependencies" $STD apt install -y \ - nginx \ - openssl + nginx \ + openssl msg_ok "Installed Dependencies" PHP_VERSION="8.2" PHP_MODULE="common,fpm" setup_php @@ -25,9 +25,9 @@ fetch_and_deploy_gh_release "privatebin" "PrivateBin/PrivateBin" "tarball" msg_info "Generating Universal SSL Certificate" mkdir -p /etc/ssl/privatebin $STD openssl req -x509 -nodes -days 3650 -newkey rsa:2048 \ - -keyout /etc/ssl/privatebin/key.pem \ - -out /etc/ssl/privatebin/cert.pem \ - -subj "/CN=PrivateBin" + -keyout /etc/ssl/privatebin/key.pem \ + -out /etc/ssl/privatebin/cert.pem \ + -subj "/CN=PrivateBin" msg_ok "Certificate Generated" msg_info "Configuring Environment" @@ -89,9 +89,4 @@ msg_ok "Nginx Configured" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/projectsend-install.sh b/install/projectsend-install.sh index 5e7af12ea..168a7f594 100644 --- a/install/projectsend-install.sh +++ b/install/projectsend-install.sh @@ -71,9 +71,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/prometheus-alertmanager-install.sh b/install/prometheus-alertmanager-install.sh index 39f5f713b..b4a6b2031 100755 --- a/install/prometheus-alertmanager-install.sh +++ b/install/prometheus-alertmanager-install.sh @@ -45,9 +45,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/prometheus-blackbox-exporter-install.sh b/install/prometheus-blackbox-exporter-install.sh index af4d66511..bf57aa6a3 100644 --- a/install/prometheus-blackbox-exporter-install.sh +++ b/install/prometheus-blackbox-exporter-install.sh @@ -35,9 +35,4 @@ msg_ok "Service Created" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/prometheus-install.sh b/install/prometheus-install.sh index 1c3723b60..e4bb47558 100644 --- a/install/prometheus-install.sh +++ b/install/prometheus-install.sh @@ -46,9 +46,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/prometheus-paperless-ngx-exporter-install.sh b/install/prometheus-paperless-ngx-exporter-install.sh index 253aa6e3b..aeacec406 100755 --- a/install/prometheus-paperless-ngx-exporter-install.sh +++ b/install/prometheus-paperless-ngx-exporter-install.sh @@ -46,9 +46,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/prometheus-pve-exporter-install.sh b/install/prometheus-pve-exporter-install.sh index abc4de8ba..7b2b1d073 100644 --- a/install/prometheus-pve-exporter-install.sh +++ b/install/prometheus-pve-exporter-install.sh @@ -56,9 +56,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/prowlarr-install.sh b/install/prowlarr-install.sh index efb104edb..c70c77814 100644 --- a/install/prowlarr-install.sh +++ b/install/prowlarr-install.sh @@ -46,9 +46,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/proxmox-backup-server-install.sh b/install/proxmox-backup-server-install.sh index bbd757db2..baa233368 100644 --- a/install/proxmox-backup-server-install.sh +++ b/install/proxmox-backup-server-install.sh @@ -26,9 +26,4 @@ msg_ok "Installed Proxmox Backup Server" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/proxmox-datacenter-manager-install.sh b/install/proxmox-datacenter-manager-install.sh index 531167902..1f17d8c7d 100644 --- a/install/proxmox-datacenter-manager-install.sh +++ b/install/proxmox-datacenter-manager-install.sh @@ -32,9 +32,4 @@ msg_ok "Installed Proxmox Datacenter Manager" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/proxmox-mail-gateway-install.sh b/install/proxmox-mail-gateway-install.sh index 49dd8c5c6..7ec302d7e 100644 --- a/install/proxmox-mail-gateway-install.sh +++ b/install/proxmox-mail-gateway-install.sh @@ -28,9 +28,4 @@ msg_ok "Installed Proxmox Mail Gateway" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/ps5-mqtt-install.sh b/install/ps5-mqtt-install.sh index e76ab92d6..7f7c66aea 100644 --- a/install/ps5-mqtt-install.sh +++ b/install/ps5-mqtt-install.sh @@ -84,9 +84,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/pterodactyl-panel-install.sh b/install/pterodactyl-panel-install.sh index 4c6164114..d6ec9e610 100644 --- a/install/pterodactyl-panel-install.sh +++ b/install/pterodactyl-panel-install.sh @@ -87,7 +87,8 @@ chmod -R 755 /opt/pterodactyl-panel/storage/* /opt/pterodactyl-panel/bootstrap/c echo "pterodactyl Admin Email: $ADMIN_EMAIL" echo "pterodactyl Admin Password: $ADMIN_PASS" } >>~/pterodactyl-panel.creds - +rm -rf "/opt/pterodactyl-panel/panel.tar.gz" +rm -rf "/tmp/debsuryorg-archive-keyring.deb" echo "${RELEASE}" >/opt/"${APPLICATION}"_version.txt msg_ok "Installed pterodactyl Panel" @@ -138,11 +139,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -rm -rf "/opt/pterodactyl-panel/panel.tar.gz" -rm -rf "/tmp/debsuryorg-archive-keyring.deb" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/pterodactyl-wings-install.sh b/install/pterodactyl-wings-install.sh index ebec2ecf4..0b1b9ee8d 100644 --- a/install/pterodactyl-wings-install.sh +++ b/install/pterodactyl-wings-install.sh @@ -56,9 +56,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/pulse-install.sh b/install/pulse-install.sh index 6492572dd..fae3d24f3 100644 --- a/install/pulse-install.sh +++ b/install/pulse-install.sh @@ -61,9 +61,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/pve-scripts-local-install.sh b/install/pve-scripts-local-install.sh index 6719508ec..86f33016c 100644 --- a/install/pve-scripts-local-install.sh +++ b/install/pve-scripts-local-install.sh @@ -59,9 +59,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/qbittorrent-install.sh b/install/qbittorrent-install.sh index e2c12cb94..9d36d0cd3 100644 --- a/install/qbittorrent-install.sh +++ b/install/qbittorrent-install.sh @@ -50,9 +50,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/rabbitmq-install.sh b/install/rabbitmq-install.sh index 4980950bc..425a75ea5 100644 --- a/install/rabbitmq-install.sh +++ b/install/rabbitmq-install.sh @@ -67,9 +67,4 @@ msg_ok "Created User" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/radarr-install.sh b/install/radarr-install.sh index 5a0a1a2e0..af7ffb929 100644 --- a/install/radarr-install.sh +++ b/install/radarr-install.sh @@ -46,9 +46,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/radicale-install.sh b/install/radicale-install.sh index a43d4bb56..6209a0b8d 100644 --- a/install/radicale-install.sh +++ b/install/radicale-install.sh @@ -63,9 +63,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/rclone-install.sh b/install/rclone-install.sh index 2cd6ee2ca..f54a32441 100644 --- a/install/rclone-install.sh +++ b/install/rclone-install.sh @@ -51,9 +51,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/rdtclient-install.sh b/install/rdtclient-install.sh index 5b606b913..989262ebb 100644 --- a/install/rdtclient-install.sh +++ b/install/rdtclient-install.sh @@ -26,6 +26,7 @@ msg_info "Configuring rdtclient" cd /opt/rdtc mkdir -p data/{db,downloads} sed -i 's#/data/db/#/opt/rdtc&#g' /opt/rdtc/appsettings.json +rm -f ~/packages-microsoft-prod.deb msg_ok "Configured rdtclient" msg_info "Creating Service" @@ -47,10 +48,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -rm -f ~/packages-microsoft-prod.deb -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/reactive-resume-install.sh b/install/reactive-resume-install.sh index fa1579dad..bad3baff8 100644 --- a/install/reactive-resume-install.sh +++ b/install/reactive-resume-install.sh @@ -123,6 +123,8 @@ EOF echo "Database Name: $DB_NAME" echo "Minio Root Password: ${MINIO_PASS}" } >>~/"$APPLICATION".creds +rm -f /tmp/v"$TAG".zip +rm -f /tmp/minio.deb msg_ok "Configured applications" msg_info "Creating Services" @@ -171,11 +173,4 @@ msg_ok "Created Services" motd_ssh customize - -msg_info "Cleaning up" -rm -f /tmp/v"$TAG".zip -rm -f /tmp/minio.deb -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/readarr-install.sh b/install/readarr-install.sh index 917422885..fb3818620 100644 --- a/install/readarr-install.sh +++ b/install/readarr-install.sh @@ -25,6 +25,7 @@ $STD curl -fsSL 'https://readarr.servarr.com/v1/update/develop/updatefile?os=lin $STD tar -xvzf readarr.tar.gz mv Readarr /opt chmod 775 /opt/Readarr +rm -rf Readarr.develop.*.tar.gz msg_ok "Installed Readarr" msg_info "Creating Service" @@ -48,10 +49,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -rm -rf Readarr.develop.*.tar.gz -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/readeck-install.sh b/install/readeck-install.sh index eb7f1cd2d..f2ebad70a 100644 --- a/install/readeck-install.sh +++ b/install/readeck-install.sh @@ -42,9 +42,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/recyclarr-install.sh b/install/recyclarr-install.sh index f177c9bed..e9cc3f508 100644 --- a/install/recyclarr-install.sh +++ b/install/recyclarr-install.sh @@ -26,9 +26,4 @@ msg_ok "Configured Recyclarr" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/redis-install.sh b/install/redis-install.sh index b1353956c..90c72d235 100644 --- a/install/redis-install.sh +++ b/install/redis-install.sh @@ -36,9 +36,4 @@ msg_ok "Installed Redis" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/reitti-install.sh b/install/reitti-install.sh index 851a2aa4e..9b2e5953d 100644 --- a/install/reitti-install.sh +++ b/install/reitti-install.sh @@ -157,9 +157,4 @@ msg_ok "Created Services" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/resiliosync-install.sh b/install/resiliosync-install.sh index 4cb36beec..63f10f3cf 100644 --- a/install/resiliosync-install.sh +++ b/install/resiliosync-install.sh @@ -34,9 +34,4 @@ msg_ok "Installed Resilio Sync" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/revealjs-install.sh b/install/revealjs-install.sh index 8f3a2893b..5baef2a6e 100644 --- a/install/revealjs-install.sh +++ b/install/revealjs-install.sh @@ -43,9 +43,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/runtipi-install.sh b/install/runtipi-install.sh index 3c58a6280..0ac22725c 100644 --- a/install/runtipi-install.sh +++ b/install/runtipi-install.sh @@ -33,14 +33,9 @@ curl -fsSL "https://raw.githubusercontent.com/runtipi/runtipi/master/scripts/ins chmod +x install.sh $STD ./install.sh chmod 666 /opt/runtipi/state/settings.json +rm -f /opt/install.sh msg_ok "Installed Runtipi" motd_ssh customize - -msg_info "Cleaning up" -rm /opt/install.sh -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/rustdeskserver-install.sh b/install/rustdeskserver-install.sh index a3d0caae7..07c1502ce 100644 --- a/install/rustdeskserver-install.sh +++ b/install/rustdeskserver-install.sh @@ -20,9 +20,4 @@ fetch_and_deploy_gh_release "rustdesk-api" "lejianwen/rustdesk-api" "binary" "la motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/sabnzbd-install.sh b/install/sabnzbd-install.sh index baa868c54..d091dca43 100644 --- a/install/sabnzbd-install.sh +++ b/install/sabnzbd-install.sh @@ -15,8 +15,8 @@ update_os msg_info "Installing Dependencies" $STD apt install -y \ - par2 \ - p7zip-full + par2 \ + p7zip-full msg_ok "Installed Dependencies" PYTHON_VERSION="3.13" setup_uv @@ -66,9 +66,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/salt-install.sh b/install/salt-install.sh index f655f587f..54dbe8aed 100644 --- a/install/salt-install.sh +++ b/install/salt-install.sh @@ -37,9 +37,4 @@ msg_ok "Installed Salt" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/scraparr-install.sh b/install/scraparr-install.sh index 36f27276b..c3664e84c 100644 --- a/install/scraparr-install.sh +++ b/install/scraparr-install.sh @@ -49,9 +49,4 @@ msg_ok "Configured Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/searxng-install.sh b/install/searxng-install.sh index 66967d6a2..bbb4e175d 100644 --- a/install/searxng-install.sh +++ b/install/searxng-install.sh @@ -114,9 +114,4 @@ msg_ok "Created Services" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/seelf-install.sh b/install/seelf-install.sh index 05072c1ef..1ff83aadc 100644 --- a/install/seelf-install.sh +++ b/install/seelf-install.sh @@ -61,9 +61,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/semaphore-install.sh b/install/semaphore-install.sh index f3325035a..9996fc1ab 100644 --- a/install/semaphore-install.sh +++ b/install/semaphore-install.sh @@ -76,9 +76,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/sftpgo-install.sh b/install/sftpgo-install.sh index c7fece8d0..010bbbe35 100644 --- a/install/sftpgo-install.sh +++ b/install/sftpgo-install.sh @@ -34,9 +34,4 @@ msg_ok "Installed SFTPGo" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/shinobi-install.sh b/install/shinobi-install.sh index 03c2b31c9..168f0640c 100644 --- a/install/shinobi-install.sh +++ b/install/shinobi-install.sh @@ -67,8 +67,4 @@ msg_ok "Installed Shinobi" 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/signoz-install.sh b/install/signoz-install.sh index 647660c1f..b11381498 100644 --- a/install/signoz-install.sh +++ b/install/signoz-install.sh @@ -258,14 +258,10 @@ ExecStart=/opt/signoz-otel-collector/bin/signoz-otel-collector --config=/opt/sig WantedBy=multi-user.target EOF systemctl enable -q --now signoz-otel-collector +rm -rf ~/zookeeper.tar.gz +rm -rf ~/apache-zookeeper-*-bin +msg_ok "Setup Signoz OTel Collector" motd_ssh customize - -msg_info "Cleaning up" -rm -rf ~/zookeeper.tar.gz -rm -rf ~/apache-zookeeper-*-bin -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/silverbullet-install.sh b/install/silverbullet-install.sh index 6c476e1e6..21ab56d96 100644 --- a/install/silverbullet-install.sh +++ b/install/silverbullet-install.sh @@ -37,9 +37,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/slskd-install.sh b/install/slskd-install.sh index c918d5664..b9d7b199b 100644 --- a/install/slskd-install.sh +++ b/install/slskd-install.sh @@ -108,15 +108,10 @@ WantedBy=multi-user.target EOF systemctl enable -q --now ${APPLICATION} systemctl enable -q soularr.timer +rm -rf $tmp_file +rm -rf /tmp/main.zip msg_ok "Created Services" motd_ssh customize - -msg_info "Cleaning up" -rm -rf $tmp_file -rm -rf /tmp/main.zip -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/smokeping-install.sh b/install/smokeping-install.sh index aa30bc8a4..80014eb6b 100644 --- a/install/smokeping-install.sh +++ b/install/smokeping-install.sh @@ -64,9 +64,4 @@ msg_ok "Installed SmokePing" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/snipeit-install.sh b/install/snipeit-install.sh index 31202ea66..9c67972b9 100644 --- a/install/snipeit-install.sh +++ b/install/snipeit-install.sh @@ -84,9 +84,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/sonarqube-install.sh b/install/sonarqube-install.sh index b4394bc5b..e8e9ce8f7 100644 --- a/install/sonarqube-install.sh +++ b/install/sonarqube-install.sh @@ -74,9 +74,4 @@ msg_ok "Service Created" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/sonarr-install.sh b/install/sonarr-install.sh index 3c7e2bff6..a2d80cca7 100644 --- a/install/sonarr-install.sh +++ b/install/sonarr-install.sh @@ -46,9 +46,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/spoolman-install.sh b/install/spoolman-install.sh index 9d8b162ea..0217a825d 100644 --- a/install/spoolman-install.sh +++ b/install/spoolman-install.sh @@ -64,9 +64,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/sqlserver2022-install.sh b/install/sqlserver2022-install.sh index 0e70df904..d26d422e4 100644 --- a/install/sqlserver2022-install.sh +++ b/install/sqlserver2022-install.sh @@ -51,8 +51,4 @@ msg_ok "Service started" 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/stirling-pdf-install.sh b/install/stirling-pdf-install.sh index 6b4d805e2..de46666d4 100644 --- a/install/stirling-pdf-install.sh +++ b/install/stirling-pdf-install.sh @@ -181,10 +181,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -rm -f /tmp/jbig2enc.tar.gz -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/streamlink-webui-install.sh b/install/streamlink-webui-install.sh index e513d7a41..d1cb49fa3 100644 --- a/install/streamlink-webui-install.sh +++ b/install/streamlink-webui-install.sh @@ -59,9 +59,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/stylus-install.sh b/install/stylus-install.sh index 8f69d546c..065c27134 100644 --- a/install/stylus-install.sh +++ b/install/stylus-install.sh @@ -39,9 +39,4 @@ msg_ok "Created service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned up" +cleanup_lxc diff --git a/install/suwayomiserver-install.sh b/install/suwayomiserver-install.sh index 39fc1fa23..1484415bd 100644 --- a/install/suwayomiserver-install.sh +++ b/install/suwayomiserver-install.sh @@ -38,9 +38,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/syncthing-install.sh b/install/syncthing-install.sh index de5144ee1..38d70218c 100644 --- a/install/syncthing-install.sh +++ b/install/syncthing-install.sh @@ -36,9 +36,4 @@ msg_ok "Installed Syncthing" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/tandoor-install.sh b/install/tandoor-install.sh index 97afb05b1..4cf6c4823 100644 --- a/install/tandoor-install.sh +++ b/install/tandoor-install.sh @@ -138,9 +138,4 @@ msg_ok "Created Services" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/tasmoadmin-install.sh b/install/tasmoadmin-install.sh index 731715120..409d389ed 100644 --- a/install/tasmoadmin-install.sh +++ b/install/tasmoadmin-install.sh @@ -49,9 +49,4 @@ msg_ok "Configured TasmoAdmin" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/tasmocompiler-install.sh b/install/tasmocompiler-install.sh index a94cc2e30..3379b11ff 100644 --- a/install/tasmocompiler-install.sh +++ b/install/tasmocompiler-install.sh @@ -42,6 +42,7 @@ mkdir -p /usr/local/bin ln -s ~/.platformio/penv/bin/platformio /usr/local/bin/platformio ln -s ~/.platformio/penv/bin/pio /usr/local/bin/pio ln -s ~/.platformio/penv/bin/piodebuggdb /usr/local/bin/piodebuggdb +rm -f /tmp/v${RELEASE}.tar.gz echo "${RELEASE}" >"/opt/tasmocompiler_version.txt" msg_ok "Setup TasmoCompiler" @@ -64,10 +65,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -rm -f /tmp/v${RELEASE}.tar.gz -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/tautulli-install.sh b/install/tautulli-install.sh index ee05815b8..1b9468bce 100644 --- a/install/tautulli-install.sh +++ b/install/tautulli-install.sh @@ -54,9 +54,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/tdarr-install.sh b/install/tdarr-install.sh index 10657e4f6..ba06dc8e8 100644 --- a/install/tdarr-install.sh +++ b/install/tdarr-install.sh @@ -25,6 +25,7 @@ curl -fsSL "$RELEASE" -o Tdarr_Updater.zip $STD unzip Tdarr_Updater.zip chmod +x Tdarr_Updater $STD ./Tdarr_Updater +rm -rf /opt/tdarr/Tdarr_Updater.zip msg_ok "Installed Tdarr" msg_info "Setting Up Hardware Acceleration" @@ -101,10 +102,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -rm -rf /opt/tdarr/Tdarr_Updater.zip -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/teamspeak-server-install.sh b/install/teamspeak-server-install.sh index 1a7336906..506334944 100644 --- a/install/teamspeak-server-install.sh +++ b/install/teamspeak-server-install.sh @@ -20,6 +20,7 @@ curl -fsSL "https://files.teamspeak-services.com/releases/server/${RELEASE}/team tar -xf ./ts3server.tar.bz2 mv teamspeak3-server_linux_amd64/ /opt/teamspeak-server/ touch /opt/teamspeak-server/.ts3server_license_accepted +rm -f ~/ts3server.tar.bz* echo "${RELEASE}" >~/.teamspeak-server msg_ok "Setup Teamspeak Server" @@ -48,10 +49,4 @@ msg_ok "Created service" motd_ssh customize - -msg_info "Cleaning up" -rm -f ~/ts3server.tar.bz* -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/teddycloud-install.sh b/install/teddycloud-install.sh index 1d0ef3738..487d7957e 100644 --- a/install/teddycloud-install.sh +++ b/install/teddycloud-install.sh @@ -43,9 +43,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/telegraf-install.sh b/install/telegraf-install.sh index cf1b25c99..f8260533b 100644 --- a/install/telegraf-install.sh +++ b/install/telegraf-install.sh @@ -32,14 +32,9 @@ msg_ok "Added Telegraf Repository" msg_info "Installing Telegraf" $STD apt update $STD apt install telegraf -y +rm /influxdata-archive.key msg_ok "Installed Telegraf" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -rm /influxdata-archive.key -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/the-lounge-install.sh b/install/the-lounge-install.sh index 73469fea1..034cccc75 100644 --- a/install/the-lounge-install.sh +++ b/install/the-lounge-install.sh @@ -17,9 +17,4 @@ fetch_and_deploy_gh_release "thelounge" "thelounge/thelounge-deb" "binary" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/threadfin-install.sh b/install/threadfin-install.sh index 96a50533f..40ac90594 100644 --- a/install/threadfin-install.sh +++ b/install/threadfin-install.sh @@ -43,9 +43,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/tianji-install.sh b/install/tianji-install.sh index 527adb9bf..38b0f4f94 100644 --- a/install/tianji-install.sh +++ b/install/tianji-install.sh @@ -64,6 +64,9 @@ JWT_SECRET="$TIANJI_SECRET" EOF cd /opt/tianji/src/server $STD pnpm db:migrate:apply +rm -rf /opt/tianji/src/client +rm -rf /opt/tianji/website +rm -rf /opt/tianji/reporter msg_ok "Setup Tianji" msg_info "Setup AppRise" @@ -92,12 +95,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -rm -rf /opt/tianji/src/client -rm -rf /opt/tianji/website -rm -rf /opt/tianji/reporter -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/traccar-install.sh b/install/traccar-install.sh index a39a6d7dc..01a599c7d 100644 --- a/install/traccar-install.sh +++ b/install/traccar-install.sh @@ -18,6 +18,7 @@ fetch_and_deploy_gh_release "traccar" "traccar/traccar" "prebuild" "latest" "/op msg_info "Configuring Traccar" cd /opt/traccar $STD ./traccar.run +[ -f README.txt ] || [ -f traccar.run ] && rm -f README.txt traccar.run msg_ok "Configured Traccar" msg_info "Starting service" @@ -26,10 +27,4 @@ msg_ok "Service started" motd_ssh customize - -msg_info "Cleaning up" -[ -f README.txt ] || [ -f traccar.run ] && rm -f README.txt traccar.run -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/tracktor-install.sh b/install/tracktor-install.sh index 8e82d76d6..c1efd45a3 100644 --- a/install/tracktor-install.sh +++ b/install/tracktor-install.sh @@ -63,9 +63,4 @@ msg_ok "Created service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/traefik-install.sh b/install/traefik-install.sh index db505469e..361b230d9 100644 --- a/install/traefik-install.sh +++ b/install/traefik-install.sh @@ -95,9 +95,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/transmission-install.sh b/install/transmission-install.sh index 7653c2465..600df5945 100644 --- a/install/transmission-install.sh +++ b/install/transmission-install.sh @@ -22,9 +22,4 @@ msg_ok "Installed Transmission" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/trilium-install.sh b/install/trilium-install.sh index 8a04169a9..7dff01063 100644 --- a/install/trilium-install.sh +++ b/install/trilium-install.sh @@ -37,9 +37,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/tududi-install.sh b/install/tududi-install.sh index cbc60363f..52fd769fc 100644 --- a/install/tududi-install.sh +++ b/install/tududi-install.sh @@ -69,9 +69,4 @@ msg_ok "Created service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/tunarr-install.sh b/install/tunarr-install.sh index ebad1df24..ee3e09d81 100644 --- a/install/tunarr-install.sh +++ b/install/tunarr-install.sh @@ -93,9 +93,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/twingate-connector-install.sh b/install/twingate-connector-install.sh index 0b4b9f3a6..4a4f10c19 100644 --- a/install/twingate-connector-install.sh +++ b/install/twingate-connector-install.sh @@ -29,7 +29,7 @@ done msg_info "Setup Twingate Repository" curl -fsSL "https://packages.twingate.com/apt/gpg.key" | gpg --dearmor -o /usr/share/keyrings/twingate-connector-keyring.gpg -echo "deb [signed-by=/usr/share/keyrings/twingate-connector-keyring.gpg] https://packages.twingate.com/apt/ /" > /etc/apt/sources.list.d/twingate.list +echo "deb [signed-by=/usr/share/keyrings/twingate-connector-keyring.gpg] https://packages.twingate.com/apt/ /" >/etc/apt/sources.list.d/twingate.list $STD apt-get update msg_ok "Setup Twingate Repository" @@ -44,7 +44,7 @@ msg_info "Configure Twingate-Connector" echo "TWINGATE_REFRESH_TOKEN=${refresh_token}" echo "TWINGATE_LABEL_HOSTNAME=$(hostname)" echo "TWINGATE_LABEL_DEPLOYED_BY=proxmox" -} > /etc/twingate/connector.conf +} >/etc/twingate/connector.conf chmod 600 /etc/twingate/connector.conf msg_ok "Configured Twingate-Connector" @@ -54,8 +54,4 @@ msg_ok "Service started" 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/typesense-install.sh b/install/typesense-install.sh index fbe1e877e..53d814972 100644 --- a/install/typesense-install.sh +++ b/install/typesense-install.sh @@ -19,15 +19,10 @@ cd /opt curl -fsSL "https://dl.typesense.org/releases/${RELEASE}/typesense-server-${RELEASE}-amd64.deb" -o "/opt/typesense-server-${RELEASE}-amd64.deb" $STD apt install -y /opt/typesense-server-${RELEASE}-amd64.deb echo 'enable-cors = true' >>/etc/typesense/typesense-server.ini +rm -rf /opt/typesense-server-${RELEASE}-amd64.deb echo "${RELEASE}" >"/opt/${APPLICATION}_version.txt" msg_ok "Installed TypeSense" motd_ssh customize - -msg_info "Cleaning up" -rm -rf /opt/typesense-server-${RELEASE}-amd64.deb -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/ubuntu-install.sh b/install/ubuntu-install.sh index b1b02bb23..fe633379c 100644 --- a/install/ubuntu-install.sh +++ b/install/ubuntu-install.sh @@ -15,8 +15,4 @@ update_os 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/uhf-install.sh b/install/uhf-install.sh index c396acbbf..41b8f6fc8 100644 --- a/install/uhf-install.sh +++ b/install/uhf-install.sh @@ -51,9 +51,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/umami-install.sh b/install/umami-install.sh index e7c6e4cd4..e99893a85 100644 --- a/install/umami-install.sh +++ b/install/umami-install.sh @@ -63,9 +63,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/umlautadaptarr-install.sh b/install/umlautadaptarr-install.sh index 660c5b33f..39c72c5b6 100644 --- a/install/umlautadaptarr-install.sh +++ b/install/umlautadaptarr-install.sh @@ -33,6 +33,7 @@ temp_file=$(mktemp) RELEASE=$(curl -s https://api.github.com/repos/PCJones/Umlautadaptarr/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3)}') curl -fsSL "https://github.com/PCJones/Umlautadaptarr/releases/download/${RELEASE}/linux-x64.zip" -o $temp_file $STD unzip -j $temp_file '*/**' -d /opt/UmlautAdaptarr +rm -f $temp_file echo "${RELEASE}" >"/opt/UmlautAdaptarr_version.txt" msg_ok "Installation completed" @@ -120,10 +121,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -rm -f $temp_file -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/unbound-install.sh b/install/unbound-install.sh index 77cb6990c..abcf35d35 100644 --- a/install/unbound-install.sh +++ b/install/unbound-install.sh @@ -80,9 +80,4 @@ msg_ok "Configured Logrotate" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/unifi-install.sh b/install/unifi-install.sh index 5afe356b6..469ca2746 100644 --- a/install/unifi-install.sh +++ b/install/unifi-install.sh @@ -79,9 +79,4 @@ msg_ok "Installed UniFi Network Server" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/unmanic-install.sh b/install/unmanic-install.sh index 4ee4f4eab..f455dffc7 100644 --- a/install/unmanic-install.sh +++ b/install/unmanic-install.sh @@ -72,9 +72,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/upsnap-install.sh b/install/upsnap-install.sh index 3e9c1afd9..f51c65a31 100644 --- a/install/upsnap-install.sh +++ b/install/upsnap-install.sh @@ -48,9 +48,4 @@ msg_ok "Service Created" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/uptimekuma-install.sh b/install/uptimekuma-install.sh index 20841a8d2..e5d1bb60f 100644 --- a/install/uptimekuma-install.sh +++ b/install/uptimekuma-install.sh @@ -42,9 +42,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/urbackupserver-install.sh b/install/urbackupserver-install.sh index 7c0f97df7..a62b263a2 100644 --- a/install/urbackupserver-install.sh +++ b/install/urbackupserver-install.sh @@ -19,7 +19,6 @@ $STD apt install -y \ debconf-utils msg_ok "Installed Dependencies" - msg_info "Installing UrBackup Server" curl -fsSL https://download.opensuse.org/repositories/home:uroni/Debian_12/Release.key | gpg --dearmor -o /usr/share/keyrings/home-uroni.gpg cat </dev/null @@ -37,9 +36,4 @@ msg_ok "Installed UrBackup Server" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/vaultwarden-install.sh b/install/vaultwarden-install.sh index 897eb4db2..12dab6f9d 100644 --- a/install/vaultwarden-install.sh +++ b/install/vaultwarden-install.sh @@ -107,9 +107,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/verdaccio-install.sh b/install/verdaccio-install.sh index f44d420d1..e82708e8f 100644 --- a/install/verdaccio-install.sh +++ b/install/verdaccio-install.sh @@ -87,9 +87,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/victoriametrics-install.sh b/install/victoriametrics-install.sh index 4b43ebff0..d755895bb 100644 --- a/install/victoriametrics-install.sh +++ b/install/victoriametrics-install.sh @@ -30,7 +30,7 @@ read -r -p "${TAB3}Would you like to add VictoriaLogs? " prompt if [[ ${prompt,,} =~ ^(y|yes)$ ]]; then vmlogs_filename=$(curl -fsSL "https://api.github.com/repos/VictoriaMetrics/VictoriaLogs/releases/latest" | jq -r '.assets[].name' | - grep -E '^victoria-logs-linux-amd64-v[0-9.]+\.tar\.gz$') + grep -E '^victoria-logs-linux-amd64-v[0-9.]+\.tar\.gz$') vlutils_filename=$(curl -fsSL "https://api.github.com/repos/VictoriaMetrics/VictoriaLogs/releases/latest" | jq -r '.assets[].name' | grep -E '^vlutils-linux-amd64-v[0-9.]+\.tar\.gz$') @@ -81,9 +81,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/vikunja-install.sh b/install/vikunja-install.sh index 9dec35dbb..4aabed682 100644 --- a/install/vikunja-install.sh +++ b/install/vikunja-install.sh @@ -26,15 +26,10 @@ sed -i 's|^ timezone: .*| timezone: UTC|' /etc/vikunja/config.yml sed -i 's|"./vikunja.db"|"/etc/vikunja/vikunja.db"|' /etc/vikunja/config.yml sed -i 's|./files|/etc/vikunja/files|' /etc/vikunja/config.yml systemctl start vikunja.service +rm -rf /opt/vikunja-"$RELEASE"-amd64.deb echo "${RELEASE}" >/opt/"${APPLICATION}"_version.txt msg_ok "Installed Vikunja" motd_ssh customize - -msg_info "Cleaning up" -rm -rf /opt/vikunja-"$RELEASE"-amd64.deb -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/wallos-install.sh b/install/wallos-install.sh index 967da3626..482c5d457 100644 --- a/install/wallos-install.sh +++ b/install/wallos-install.sh @@ -60,9 +60,4 @@ msg_ok "Crontabs setup" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/warracker-install.sh b/install/warracker-install.sh index 7bbe6f02c..3b92467e4 100644 --- a/install/warracker-install.sh +++ b/install/warracker-install.sh @@ -111,9 +111,4 @@ msg_ok "Started Warracker Services" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/wastebin-install.sh b/install/wastebin-install.sh index 2eda6355d..1272fff75 100644 --- a/install/wastebin-install.sh +++ b/install/wastebin-install.sh @@ -35,6 +35,7 @@ WASTEBIN_HTTP_TIMEOUT=30 WASTEBIN_SIGNING_KEY=$(openssl rand -hex 32) WASTEBIN_PASTE_EXPIRATIONS=0,600,3600=d,86400,604800,2419200,29030400 EOF +rm -f "$temp_file" echo "${RELEASE}" >"/opt/${APPLICATION}_version.txt" msg_ok "Installed Wastebin" @@ -58,10 +59,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -rm -f "$temp_file" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/watcharr-install.sh b/install/watcharr-install.sh index 6b123e98f..05e6efecc 100644 --- a/install/watcharr-install.sh +++ b/install/watcharr-install.sh @@ -52,9 +52,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/watchyourlan-install.sh b/install/watchyourlan-install.sh index 6503180c1..e38215acc 100644 --- a/install/watchyourlan-install.sh +++ b/install/watchyourlan-install.sh @@ -51,9 +51,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/wavelog-install.sh b/install/wavelog-install.sh index 58086dd5e..19292f41d 100644 --- a/install/wavelog-install.sh +++ b/install/wavelog-install.sh @@ -61,9 +61,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/wazuh-install.sh b/install/wazuh-install.sh index 3033255e5..4d63d7d30 100644 --- a/install/wazuh-install.sh +++ b/install/wazuh-install.sh @@ -35,14 +35,10 @@ else bash wazuh-install.sh -a | tee -a ~/wazuh-install.output fi cat ~/wazuh-install.output | grep -E "User|Password" | awk '{$1=$1};1' | sed '1i wazuh-credentials' >~/wazuh.creds +rm -f wazuh-*.sh +rm -f ~/wazuh-install.output msg_ok "Setup Wazuh" motd_ssh customize - -msg_info "Cleaning up" -rm -f wazuh-*.sh -rm -f ~/wazuh-install.output -$STD apt-get -y autoremove -$STD apt-get -y autoclean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/wger-install.sh b/install/wger-install.sh index 5d93b3b48..11781c141 100644 --- a/install/wger-install.sh +++ b/install/wger-install.sh @@ -49,6 +49,7 @@ sed -i "s#home/wger/src/media#home/wger/media#g" /home/wger/src/settings.py sed -i "/MEDIA_ROOT = '\/home\/wger\/media'/a STATIC_ROOT = '/home/wger/static'" /home/wger/src/settings.py $STD wger bootstrap $STD python3 manage.py collectstatic +rm -rf "$temp_dir" echo "${RELEASE}" >/opt/wger_version.txt msg_ok "Finished setting up wger" @@ -103,13 +104,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -rm -rf "$temp_dir" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" - -motd_ssh -customize +cleanup_lxc diff --git a/install/whisparr-install.sh b/install/whisparr-install.sh index 17ef57fe3..e298572ef 100644 --- a/install/whisparr-install.sh +++ b/install/whisparr-install.sh @@ -25,6 +25,7 @@ $STD curl -fsSL 'https://whisparr.servarr.com/v1/update/nightly/updatefile?os=li $STD tar -xvzf whisparr.tar.gz mv Whisparr /opt chmod 775 /opt/Whisparr +rm -rf Whisparr.develop.*.tar.gz msg_ok "Installed Whisparr" msg_info "Creating Service" @@ -47,10 +48,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -rm -rf Whisparr.develop.*.tar.gz -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/wikijs-install.sh b/install/wikijs-install.sh index 7b8911c52..4bcc0fae2 100644 --- a/install/wikijs-install.sh +++ b/install/wikijs-install.sh @@ -68,9 +68,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/wireguard-install.sh b/install/wireguard-install.sh index 174f5340d..d7e7c3c62 100644 --- a/install/wireguard-install.sh +++ b/install/wireguard-install.sh @@ -81,9 +81,4 @@ fi motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/wizarr-install.sh b/install/wizarr-install.sh index 51508e7f7..7e5a33607 100644 --- a/install/wizarr-install.sh +++ b/install/wizarr-install.sh @@ -72,9 +72,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/wordpress-install.sh b/install/wordpress-install.sh index 25a51d731..058922776 100644 --- a/install/wordpress-install.sh +++ b/install/wordpress-install.sh @@ -44,6 +44,7 @@ sed -i -e "s|^define( 'DB_NAME', '.*' );|define( 'DB_NAME', '$DB_NAME' );|" \ -e "s|^define( 'DB_USER', '.*' );|define( 'DB_USER', '$DB_USER' );|" \ -e "s|^define( 'DB_PASSWORD', '.*' );|define( 'DB_PASSWORD', '$DB_PASS' );|" \ /var/www/html/wordpress/wp-config.php +rm -rf /var/www/html/latest.zip msg_ok "Installed Wordpress" msg_info "Setup Services" @@ -68,10 +69,4 @@ msg_ok "Created Services" motd_ssh customize - -msg_info "Cleaning up" -rm -rf /var/www/html/latest.zip -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/yt-dlp-webui-install.sh b/install/yt-dlp-webui-install.sh index f6db291e7..1979f29ca 100644 --- a/install/yt-dlp-webui-install.sh +++ b/install/yt-dlp-webui-install.sh @@ -85,9 +85,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/yunohost-install.sh b/install/yunohost-install.sh index 20baaf573..d1d5559b0 100644 --- a/install/yunohost-install.sh +++ b/install/yunohost-install.sh @@ -39,8 +39,4 @@ msg_ok "Installed YunoHost" 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/zabbix-install.sh b/install/zabbix-install.sh index 188048fde..950eb9d77 100644 --- a/install/zabbix-install.sh +++ b/install/zabbix-install.sh @@ -110,14 +110,9 @@ fi systemctl restart zabbix-server apache2 systemctl enable -q --now zabbix-server $AGENT_SERVICE apache2 +rm -rf /tmp/zabbix-release_latest+debian13_all.deb msg_ok "Started Services" motd_ssh customize - -msg_info "Cleaning up" -rm -rf /tmp/zabbix-release_latest+debian13_all.deb -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/zammad-install.sh b/install/zammad-install.sh index 6d3ce7fbf..69712c4a6 100644 --- a/install/zammad-install.sh +++ b/install/zammad-install.sh @@ -62,9 +62,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/zerotier-one-install.sh b/install/zerotier-one-install.sh index 18734be60..b00a2048d 100644 --- a/install/zerotier-one-install.sh +++ b/install/zerotier-one-install.sh @@ -37,9 +37,4 @@ msg_ok "Done setting up UI." motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/zigbee2mqtt-install.sh b/install/zigbee2mqtt-install.sh index c6af992e6..1ad7b7680 100644 --- a/install/zigbee2mqtt-install.sh +++ b/install/zigbee2mqtt-install.sh @@ -57,9 +57,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/zipline-install.sh b/install/zipline-install.sh index 524f74bbe..177d20bf3 100644 --- a/install/zipline-install.sh +++ b/install/zipline-install.sh @@ -72,9 +72,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/zitadel-install.sh b/install/zitadel-install.sh index fcf2378ae..eab86b6fa 100644 --- a/install/zitadel-install.sh +++ b/install/zitadel-install.sh @@ -142,9 +142,4 @@ msg_ok "Bash script for rerunning Zitadel after changing Zitadel config.yaml" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/zoraxy-install.sh b/install/zoraxy-install.sh index 560567052..c0a0778d5 100644 --- a/install/zoraxy-install.sh +++ b/install/zoraxy-install.sh @@ -35,9 +35,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/zot-registry-install.sh b/install/zot-registry-install.sh index 793d3b1e0..6966ecaf7 100644 --- a/install/zot-registry-install.sh +++ b/install/zot-registry-install.sh @@ -55,9 +55,4 @@ msg_ok "Setup Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/zwave-js-ui-install.sh b/install/zwave-js-ui-install.sh index 269f0fe91..258061118 100644 --- a/install/zwave-js-ui-install.sh +++ b/install/zwave-js-ui-install.sh @@ -44,9 +44,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc