Alis/env var updates (#89)

* feat: add optional configuration variables and update wizard script

* fix: update script URLs to main branch and remove cleanup of ubuntu user

Author: alismx

dibbs-ecr-viewer/dibbs-ecr-viewer-wizard.sh.home

@@ -93,6 +93,7 @@ set_vars() {
       pg
       auth
       nextauth
+      optional
       break
       ;;
     "AWS_PG_DUAL")
@@ -103,6 +104,7 @@ set_vars() {
       nbs
       auth
       nextauth
+      optional
       break
       ;;
     "AWS_SQLSERVER_NON_INTEGRATED")
@@ -112,6 +114,7 @@ set_vars() {
       sqlserver
       auth
       nextauth
+      optional
       break
       ;;
     "AWS_SQLSERVER_DUAL")
@@ -122,6 +125,7 @@ set_vars() {
       nbs
       auth
       nextauth
+      optional
       break
       ;;
     "AWS_INTEGRATED")
@@ -130,6 +134,7 @@ set_vars() {
       aws
       nbs
       nextauth
+      optional
       break
       ;;
     "AZURE_PG_NON_INTEGRATED")
@@ -139,6 +144,7 @@ set_vars() {
       pg
       auth
       nextauth
+      optional
       break
       ;;
     "AZURE_PG_DUAL")
@@ -149,6 +155,7 @@ set_vars() {
       nbs
       auth
       nextauth
+      optional
       break
       ;;
     "AZURE_SQLSERVER_NON_INTEGRATED")
@@ -158,6 +165,7 @@ set_vars() {
       sqlserver
       auth
       nextauth
+      optional
       break
       ;;
     "AZURE_SQLSERVER_DUAL")
@@ -168,6 +176,7 @@ set_vars() {
       nbs
       auth
       nextauth
+      optional
       break
       ;;
     "AZURE_INTEGRATED")
@@ -176,6 +185,7 @@ set_vars() {
       azure
       nbs
       nextauth
+      optional
       break
       ;;
     "GCP_PG_NON_INTEGRATED")
@@ -185,6 +195,7 @@ set_vars() {
       pg
       auth
       nextauth
+      optional
       break
       ;;
     "GCP_PG_DUAL")
@@ -195,6 +206,7 @@ set_vars() {
       nbs
       auth
       nextauth
+      optional
       break
       ;;
     "GCP_SQLSERVER_NON_INTEGRATED")
@@ -204,6 +216,7 @@ set_vars() {
       sqlserver
       auth
       nextauth
+      optional
       break
       ;;
     "GCP_SQLSERVER_DUAL")
@@ -214,6 +227,7 @@ set_vars() {
       nbs
       auth
       nextauth
+      optional
       break
       ;;
     "GCP_INTEGRATED")
@@ -222,6 +236,7 @@ set_vars() {
       gcp
       nbs
       nextauth
+      optional
       break
       ;;
     "Quit")
@@ -315,13 +330,20 @@ auth() {
   check_var AUTH_CLIENT_ID
   check_var AUTH_CLIENT_SECRET
   check_var AUTH_ISSUER
+  check_var AUTH_SESSION_DURATION_MIN "Optional: leave blank for use defaults"
   check_var NEXTAUTH_URL "URL for the eCR Viewer application authentication: http(s)://(DOMAIN||IP:PORT)/ecr-viewer/api/auth/"
 }
 
 nextauth() {
   check_var NEXTAUTH_SECRET "Generate a random secret using: openssl rand -base64 32"
 }
 
+optional() {
+  check_var SAVE_XML "Optional: leave blank for use defaults"
+  check_var DISPLAY_FEEDBACK_LINKS "Optional: leave blank for use defaults"
+  check_var ECR_PROCESSING_TIMEOUT "Optional: leave blank for use defaults"
+}
+
 aws() {
   check_var AWS_REGION
   check_var ECR_BUCKET_NAME

dibbs-ecr-viewer/packer/dibbs-ecr-viewer.pkr.hcl

@@ -175,4 +175,5 @@ build {
 
     execute_command = "echo '${var.ssh_password}' | {{.Vars}} sudo -S -E bash '{{.Path}}'"
   }
+
 }

dibbs-ecr-viewer/packer/http/aws-user-data

@@ -22,17 +22,17 @@ sed -i 's/^#*PasswordAuthentication .*/PasswordAuthentication yes/' /etc/ssh/ssh
 systemctl restart ssh
 
 # Run postinstall script
-wget -O /tmp/postinstall.sh https://raw.githubusercontent.com/CDCgov/dibbs-vm/refs/heads/alis/vm_work1/dibbs-ecr-viewer/packer/scripts/post-install.sh
+wget -O /tmp/postinstall.sh https://raw.githubusercontent.com/CDCgov/dibbs-vm/refs/heads/main/dibbs-ecr-viewer/packer/scripts/post-install.sh
 bash /tmp/postinstall.sh
 rm /tmp/postinstall.sh
 
 # Run fail2ban installation script
-wget -O /tmp/fail2ban-install.sh https://raw.githubusercontent.com/CDCgov/dibbs-vm/refs/heads/alis/vm_work1/dibbs-ecr-viewer/packer/scripts/fail2ban.sh
+wget -O /tmp/fail2ban-install.sh https://raw.githubusercontent.com/CDCgov/dibbs-vm/refs/heads/main/dibbs-ecr-viewer/packer/scripts/fail2ban.sh
 bash /tmp/fail2ban-install.sh
 rm /tmp/fail2ban-install.sh
 
 # Run provision script
-wget -O /tmp/provision.sh https://raw.githubusercontent.com/CDCgov/dibbs-vm/refs/heads/alis/vm_work1/dibbs-ecr-viewer/packer/scripts/provision.sh
+wget -O /tmp/provision.sh https://raw.githubusercontent.com/CDCgov/dibbs-vm/refs/heads/main/dibbs-ecr-viewer/packer/scripts/provision.sh
 bash /tmp/provision.sh
 rm /tmp/provision.sh
 

dibbs-ecr-viewer/packer/http/user-data

@@ -38,7 +38,7 @@ autoinstall:
   #    - network  
 
   locale: en_US
-  keyboard: 
+  keyboard:
     layout: us
 
   network:
@@ -68,7 +68,7 @@ autoinstall:
   late-commands:  
     # A postinstall script may optionally be used for further install
     # customization. Deploy this postinstall.sh script on the webserver.
-    - wget -O /target/postinstall.sh https://raw.githubusercontent.com/CDCgov/dibbs-vm/refs/heads/alis/vm_work1/dibbs-ecr-viewer/packer/scripts/post-install.sh
+    - wget -O /target/postinstall.sh https://raw.githubusercontent.com/CDCgov/dibbs-vm/refs/heads/main/dibbs-ecr-viewer/packer/scripts/post-install.sh
     - curtin in-target -- bash /postinstall.sh
     - rm /target/postinstall.sh
 

dibbs-ecr-viewer/packer/scripts/provision.sh

@@ -93,8 +93,3 @@ docker info
 docker compose build
 docker compose up -d
 echo "[$(date)] DIBBS provision script completed."
-
-sudo userdel -rf ubuntu
-sleep 20
-
-# check if user exists