Cockpit: offer to install 45Drives extensions during update if missing

ct/cockpit.sh

@@ -11,7 +11,7 @@ var_cpu="${var_cpu:-2}"
 var_ram="${var_ram:-1024}"
 var_disk="${var_disk:-4}"
 var_os="${var_os:-debian}"
-var_version="${var_version:-12}"
+var_version="${var_version:-13}"
 var_arm64="${var_arm64:-yes}"
 var_unprivileged="${var_unprivileged:-1}"
 
@@ -33,6 +33,22 @@ function update_script() {
   $STD apt update
   $STD apt -y upgrade
   msg_ok "Updated ${APP} LXC"
+
+  if [[ ! -f /etc/apt/sources.list.d/45drives.sources ]]; then
+    [[ "$(arch_resolve)" == "arm64" ]] || read -r -p "Would you like to install 45Drives' cockpit-file-sharing, cockpit-identities, and cockpit-navigator now? <y/N> " prompt
+    if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then
+      msg_info "Installing 45Drives' cockpit extensions"
+      setup_deb822_repo "45drives" \
+        "https://repo.45drives.com/key/gpg.asc" \
+        "https://repo.45drives.com/enterprise/debian" \
+        "$(get_os_info codename)" \
+        "main" \
+        "amd64"
+      $STD apt install -y cockpit-file-sharing cockpit-identities cockpit-navigator
+      msg_ok "Installed 45Drives' cockpit extensions"
+    fi
+  fi
+
   msg_ok "Updated successfully!"
   exit
 }

install/cockpit-install.sh

@@ -15,42 +15,33 @@ network_check
 update_os
 
 msg_info "Installing Cockpit"
-source /etc/os-release
+CODENAME=$(get_os_info codename)
 cat <<EOF >/etc/apt/sources.list.d/debian-backports.sources
 Types: deb deb-src
 URIs: http://deb.debian.org/debian
-Suites: ${VERSION_CODENAME}-backports
+Suites: ${CODENAME}-backports
 Components: main
 Enabled: yes
 Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg
 EOF
 
 $STD apt update
-$STD apt install -t ${VERSION_CODENAME}-backports cockpit cracklib-runtime --no-install-recommends -y
+$STD apt install -t ${CODENAME}-backports cockpit cracklib-runtime --no-install-recommends -y
 sed -i "s/root//g" /etc/cockpit/disallowed-users
 msg_ok "Installed Cockpit"
 
 # 45Drives only publishes amd64 packages
 [[ "$(arch_resolve)" == "arm64" ]] || read -r -p "Would you like to install 45Drives' cockpit-file-sharing, cockpit-identities, and cockpit-navigator  <y/N> " prompt
 if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then
-  install_45drives=true
-  if [[ "${VERSION_ID}" -ge 13 ]]; then
-    read -r -p "Debian ${VERSION_ID} is not officially supported by 45Drives yet, would you like to continue anyway? <y/N> " prompt
-    if [[ ! "${prompt,,}" =~ ^(y|yes)$ ]]; then
-      install_45drives=false
-    fi
-  fi
-  if [[ "$install_45drives" == "true" ]]; then
-    msg_info "Installing 45Drives' cockpit extensions"
-    setup_deb822_repo "45drives" \
-      "https://repo.45drives.com/key/gpg.asc" \
-      "https://repo.45drives.com/enterprise/debian" \
-      "bookworm" \
-      "main" \
-      "amd64"
-    $STD apt install -y cockpit-file-sharing cockpit-identities cockpit-navigator
-    msg_ok "Installed 45Drives' cockpit extensions"
-  fi
+  msg_info "Installing 45Drives' cockpit extensions"
+  setup_deb822_repo "45drives" \
+    "https://repo.45drives.com/key/gpg.asc" \
+    "https://repo.45drives.com/enterprise/debian" \
+    "${CODENAME}" \
+    "main" \
+    "amd64"
+  $STD apt install -y cockpit-file-sharing cockpit-identities cockpit-navigator
+  msg_ok "Installed 45Drives' cockpit extensions"
 fi
 
 motd_ssh

install/sync-in-install.sh

@@ -51,14 +51,7 @@ msg_ok "Ran Database Migrations"
 
 msg_info "Creating Admin User"
 cd /opt/sync-in
-ADMIN_PASS=$(openssl rand -base64 18)
-$STD npx sync-in-server create-user --role admin --login admin --password "${ADMIN_PASS}"
-{
-  echo "Sync-in Credentials"
-  echo "===================="
-  echo "Login: admin"
-  echo "Password: ${ADMIN_PASS}"
-} >~/sync-in.creds
+$STD npx sync-in-server create-user
 msg_ok "Created Admin User"
 
 VERSION=$(node -pe "require('/opt/sync-in/node_modules/@sync-in/server/package.json').version" 2>/dev/null || echo "")