Merge branch 'main' into andrew/device-inactive-threshold-at-import

.env.sample

@@ -15,9 +15,6 @@ SMTP_PORT=
 SMTP_USER=
 SMTP_PASSWORD=
 
-PGADMIN_EMAIL=[email protected]
-PGADMIN_PASSWORD=localdev
-
 # Backups
 AWS_ACCESS_KEY_ID=
 AWS_SECRET_ACCESS_KEY=
@@ -61,9 +58,11 @@ UISP_PASS=
 ADMIN_MAP_BASE_URL=http://devadminmap.mesh.nycmesh.net
 MAP_BASE_URL=https://devmap.mesh.nycmesh.net
 LOS_URL=https://devlos.mesh.nycmesh.net
-PG_ADMIN_URL=/pgadmin/
 FORMS_URL=https://devforms.mesh.nycmesh.net
 
 OSTICKET_URL=https://support.nycmesh.net
+OSTICKET_API_TOKEN=
+OSTICKET_NEW_TICKET_ENDPOINT=https://devsupport.nycmesh.net/api/http.php/tickets.json
 
 SLACK_ADMIN_NOTIFICATIONS_WEBHOOK_URL=
+SLACK_JOIN_REQUESTS_CHANNEL_WEBHOOK_URL=

.github/workflows/deploy-to-k8s.yaml

@@ -57,9 +57,6 @@ jobs:
         --set meshweb.nn_assign_psk="${{ secrets.NN_ASSIGN_PSK }}" \
         --set meshweb.query_psk="${{ secrets.QUERY_PSK }}" \
         --set meshweb.pano_github_token="${{ secrets.GH_TOKEN }}" \
-        --set pgadmin.default_email="${{ secrets.PGADMIN_EMAIL }}" \
-        --set pgadmin.default_password="${{ secrets.PGADMIN_PASSWORD }}" \
-        --set global.pgadmin.fqdn="${{ vars.PGADMIN_FQDN }}" \
         --set uisp.url="${{ secrets.UISP_URL }}" \
         --set uisp.user="${{ secrets.UISP_USER }}" \
         --set uisp.psk="${{ secrets.UISP_PSK }}" \
@@ -69,6 +66,9 @@ jobs:
         --set meshweb.forms_url="${{ vars.FORMS_URL }}" \
         --set meshdb.site_base_url="${{ vars.SITE_BASE_URL }}" \
         --set meshweb.slack_webhook="${{ secrets.SLACK_ADMIN_NOTIFICATIONS_WEBHOOK_URL }}" \
+        --set meshweb.slack_join_webhook="${{ secrets.SLACK_JOIN_REQUESTS_CHANNEL_WEBHOOK_URL }}" \
+        --set meshweb.osticket_api_token="${{ secrets.OSTICKET_API_TOKEN }}" \
+        --set meshweb.osticket_new_ticket_endpoint="${{ vars.OSTICKET_NEW_TICKET_ENDPOINT }}" \
         --set meshweb.environment="${{ inputs.environment }}" \
         --set ingress.hosts[0].host="${{ vars.INGRESS_HOST }}",ingress.hosts[0].paths[0].path=/,ingress.hosts[0].paths[0].pathType=Prefix \
         --set ingress.hosts[1].host="${{ vars.INGRESS_HOST_LEGACY }}",ingress.hosts[1].paths[0].path=/,ingress.hosts[1].paths[0].pathType=Prefix

docker-compose.yaml

@@ -33,16 +33,6 @@ services:
     ports:
       - 6379:6379
 
-  pgadmin:
-    networks:
-      - api
-    expose:
-      - 443
-    image: dpage/pgadmin4:8.9
-    environment:
-      PGADMIN_DEFAULT_EMAIL: ${PGADMIN_EMAIL}
-      PGADMIN_DEFAULT_PASSWORD: ${PGADMIN_PASSWORD}
-
   pelias:
     networks:
       - api

infra/README.md

@@ -16,8 +16,6 @@ These instructions will set up a 4 node k3s cluster on proxmox.
 | `DJANGO_SECRET_KEY` | Django secret key |
 | `GH_TOKEN` | Github token for pulling down panoramas |
 | `NN_ASSIGN_PSK` | Legacy node number assign password |
-| `PGADMIN_EMAIL` | Default username for pgadmin |
-| `PGADMIN_PASSWORD` | Default password for pgadmin |
 | `PG_PASSWORD` | meshdb postgres database password |
 | `PROJECT_PATH`  |  Absolute file system path to the clone of meshdb, likely `/root/meshdb`  |
 | `QUERY_PSK` | Legacy query password |