diff --git a/ct/configarr.sh b/ct/configarr.sh index f9823d9f5..3368d5118 100644 --- a/ct/configarr.sh +++ b/ct/configarr.sh @@ -10,7 +10,7 @@ var_cpu="${var_cpu:-1}" var_ram="${var_ram:-512}" var_disk="${var_disk:-4}" var_os="${var_os:-debian}" -var_version="${var_version:-12}" +var_version="${var_version:-13}" var_unprivileged="${var_unprivileged:-1}" header_info "$APP" @@ -28,27 +28,20 @@ function update_script() { exit fi if check_for_gh_release "configarr" "raydak-labs/configarr"; then - msg_info "Stopping $APP" + msg_info "Stopping Service" systemctl stop configarr-task.timer - msg_ok "Stopped $APP" + msg_ok "Stopped Service" - msg_info "Updating $APP" mkdir -p /opt/backup/ - mv /opt/configarr/{config.yml,secrets.yml,.env} "/opt/backup/" - rm -rf /opt/configarr - fetch_and_deploy_gh_release "configarr" "raydak-labs/configarr" - mv /opt/backup/{config.yml,secrets.yml,.env} "/opt/configarr/" - cd /opt/configarr - $STD pnpm install - $STD pnpm run build - msg_ok "Updated $APP" - - msg_info "Starting $APP" - systemctl start configarr-task.timer - msg_ok "Started configarr" - + mv /opt/configarr/{config.yml,secrets.yml,.env} /opt/backup/ + CLEAN_INSTALL=1 fetch_and_deploy_gh_release "configarr" "raydak-labs/configarr" "prebuild" "latest" "/opt/configarr" "configarr-linux-x64.tar.xz" + mv /opt/backup/{config.yml,secrets.yml,.env} /opt/configarr/ rm -rf /opt/backup - msg_ok "Updated Successfully" + + msg_info "Starting Service" + systemctl start configarr-task.timer + msg_ok "Started Service" + msg_ok "Updated Successfully!" fi exit } diff --git a/frontend/public/json/configarr.json b/frontend/public/json/configarr.json index baa041365..c108ef75f 100644 --- a/frontend/public/json/configarr.json +++ b/frontend/public/json/configarr.json @@ -23,7 +23,7 @@ "ram": 512, "hdd": 4, "os": "Debian", - "version": "12" + "version": "13" } } ], diff --git a/install/configarr-install.sh b/install/configarr-install.sh index 7ec4411a7..10edb6e5c 100644 --- a/install/configarr-install.sh +++ b/install/configarr-install.sh @@ -14,26 +14,24 @@ network_check update_os msg_info "Installing Dependencies" -$STD apt-get install -y \ - git +$STD apt install -y git msg_ok "Installed Dependencies" -NODE_MODULE="pnpm@latest" setup_nodejs -fetch_and_deploy_gh_release "configarr" "raydak-labs/configarr" +fetch_and_deploy_gh_release "configarr" "raydak-labs/configarr" "prebuild" "latest" "/opt/configarr" "configarr-linux-x64.tar.xz" -msg_info "Setup ${APPLICATION}" +msg_info "Setup Configarr" cat </opt/configarr/.env ROOT_PATH=/opt/configarr CUSTOM_REPO_ROOT=/opt/configarr/repos CONFIG_LOCATION=/opt/configarr/config.yml SECRETS_LOCATION=/opt/configarr/secrets.yml EOF -mv /opt/configarr/secrets.yml.template /opt/configarr/secrets.yml -sed 's|#localConfigTemplatesPath: /app/templates|#localConfigTemplatesPath: /opt/configarr/templates|' /opt/configarr/config.yml.template >/opt/configarr/config.yml + cd /opt/configarr -$STD pnpm install -$STD pnpm run build -msg_ok "Setup ${APPLICATION}" +curl -fsSLO https://raw.githubusercontent.com/raydak-labs/configarr/refs/heads/main/examples/full/config/config.yml +curl -fsSLO https://raw.githubusercontent.com/raydak-labs/configarr/refs/heads/main/examples/full/config/secrets.yml +sed 's|#localConfigTemplatesPath: /app/templates|#localConfigTemplatesPath: /opt/configarr/templates|' /opt/configarr/config.yml +msg_ok "Setup Configarr" msg_info "Creating Service" cat </etc/systemd/system/configarr-task.service @@ -41,9 +39,9 @@ cat </etc/systemd/system/configarr-task.service Description=Run Configarr Task [Service] -Type=oneshot +Type=simple WorkingDirectory=/opt/configarr -ExecStart=/usr/bin/node /opt/configarr/bundle.cjs +ExecStart=/opt/configarr/configarr EOF cat </etc/systemd/system/configarr-task.timer @@ -65,6 +63,7 @@ motd_ssh customize msg_info "Cleaning up" -$STD apt-get -y autoremove -$STD apt-get -y autoclean +$STD apt -y autoremove +$STD apt -y autoclean +$STD apt -y clean msg_ok "Cleaned"