eindelijk weer eens een push

2026-05-31 16:07:30 +02:00
parent 01cff8e165
commit ff21c258e0
2747 changed files with 302316 additions and 131101 deletions
@@ -14,3 +14,37 @@ toevoegen environment:

 https://defectdojo-dev.allarddcs.nl/admin/dojo/development_environment/

+#postgres schema update
+als schema achterloopt:
+
+dan:
+
+kubectl exec -it uwsgi-6cc455bb57-5v4sk -n defectdojo -- /bin/bash
+defectdojo@uwsgi-6cc455bb57-5v4sk:/app$ python manage.py migrate
+[05/Feb/2026 20:14:19] INFO [dojo.auditlog:164] Registering models with django-pghistory
+[05/Feb/2026 20:14:19] INFO [dojo.auditlog:381] Successfully registered models with django-pghistory
+[05/Feb/2026 20:14:19] INFO [dojo.auditlog:443] Audit logging disabled
+Operations to perform:
+  Apply all migrations: admin, auditlog, auth, authtoken, contenttypes, django_celery_results, dojo, pghistory, sessions, single_session, sites, social_django, watson
+Running migrations:
+  Applying dojo.0247_remove_finding_insert_insert_and_more... OK
+  Applying dojo.0248_alter_general_survey_expiration... OK
+  Applying dojo.0249_findingreviewers_findingreviewersevent_and_more... OK
+  Applying dojo.0250_pghistory_backfill...[05/Feb/2026 20:14:42] INFO [dojo.db_migrations.0250_pghistory_backfill:26] pghistory is not enabled. Skipping backfill.
+ OK
+  Applying dojo.0251_usercontactinfo_reset_timestamps... OK
+  Applying dojo.0252_finding_template_changes... OK
+  Applying dojo.0253_migrate_vulnerability_ids_to_textfield... OK
+  Applying dojo.0254_remove_vulnerability_id_template_model... OK
+  Applying dojo.0255_remove_system_settings_product_grade... OK
+
+#password resetten:
+kubectl exec -it uwsgi-6cc455bb57-5v4sk -n defectdojo -- /bin/bash
+python manage.py changepassword admin
+
+
+Yes — you can safely leave HTTP_AUTH_PASSWORD (or any similar admin/password env var) out of the YAML from now on, as long as:
+	1.	You’ve already set the admin password in the database (via python manage.py changepassword admin or the initializer).
+	2.	You don’t need to automatically create/reset the password on pod startup.
+
+The YAML variable only has an effect during first-time initialization of the app — it does not override the DB once the admin user exists. So leaving it out won’t break anything.
@@ -87,8 +87,8 @@ spec:
    - hard
    - nfsvers=4.1
  nfs:
-    server: 192.168.2.110
-    path: /mnt/nfs_share/defectdojo/media
+    server: 192.168.2.111
+    path: /mnt/nfs_share/dev/defectdojo/media
    readOnly: false
 ---
 apiVersion: apps/v1
@@ -113,7 +113,7 @@ spec:
      containers:
        - command:
            - /wait-for-it.sh
-            - postgres15.postgres:5432
+            - postgres15.defectdojo:5432
            - -t
            - "30"
            - --
@@ -126,7 +126,7 @@ spec:
            - name: DD_CREDENTIAL_AES_256_KEY
              value: '&91a*agLqesc*0DJ+2*bAbsUZfR*4nLw'
            - name: DD_DATABASE_URL
-              value: postgresql://defectdojo:defectdojo@postgres15.postgres:5432/defectdojo
+              value: postgresql://defectdojo:defectdojo@postgres15.defectdojo:5432/defectdojo
            - name: DD_DEBUG
              value: "False"
            - name: DD_DJANGO_METRICS_ENABLED
@@ -200,8 +200,8 @@ spec:
    - hard
    - nfsvers=4.1
  nfs:
-    server: 192.168.2.110
-    path: /mnt/nfs_share/defectdojo/uwsgi
+    server: 192.168.2.111
+    path: /mnt/nfs_share/dev/defectdojo/uwsgi
    readOnly: false
 ---
 apiVersion: apps/v1
@@ -226,7 +226,7 @@ spec:
      containers:
        - command:
            - /wait-for-it.sh
-            - postgres15.postgres:5432
+            - postgres15.defectdojo:5432
            - -t
            - "30"
            - --
@@ -237,7 +237,7 @@ spec:
            - name: DD_CREDENTIAL_AES_256_KEY
              value: '&91a*agLqesc*0DJ+2*bAbsUZfR*4nLw'
            - name: DD_DATABASE_URL
-              value: postgresql://defectdojo:defectdojo@postgres15.postgres:5432/defectdojo
+              value: postgresql://defectdojo:defectdojo@postgres15.defectdojo:5432/defectdojo
            - name: DD_SECRET_KEY
              value: hhZCp@D28z!n@NED*yB!ROMt+WzsY*iq
            - name: DD_ENABLE_AUDITLOG
@@ -290,8 +290,8 @@ spec:
    - hard
    - nfsvers=4.1
  nfs:
-    server: 192.168.2.110
-    path: /mnt/nfs_share/defectdojo/celeryworker
+    server: 192.168.2.111
+    path: /mnt/nfs_share/dev/defectdojo/celeryworker
    readOnly: false
 ---
 apiVersion: apps/v1
@@ -316,7 +316,7 @@ spec:
      containers:
        - command:
            - /wait-for-it.sh
-            - postgres15.postgres:5432
+            - postgres15.defectdojo:5432
            - -t
            - "30"
            - --
@@ -327,7 +327,7 @@ spec:
            - name: DD_CREDENTIAL_AES_256_KEY
              value: '&91a*agLqesc*0DJ+2*bAbsUZfR*4nLw'
            - name: DD_DATABASE_URL
-              value: postgresql://defectdojo:defectdojo@postgres15.postgres:5432/defectdojo
+              value: postgresql://defectdojo:defectdojo@postgres15.defectdojo:5432/defectdojo
            - name: DD_SECRET_KEY
              value: hhZCp@D28z!n@NED*yB!ROMt+WzsY*iq
            - name: DD_ENABLE_AUDITLOG
@@ -375,89 +375,23 @@ spec:
    - hard
    - nfsvers=4.1
  nfs:
-    server: 192.168.2.110
-    path: /mnt/nfs_share/defectdojo/celerybeat
+    server: 192.168.2.111
+    path: /mnt/nfs_share/dev/defectdojo/celerybeat
    readOnly: false
 ---
-apiVersion: apps/v1
-kind: Deployment
+apiVersion: traefik.io/v1alpha1
+kind: IngressRoute
 metadata:
-  labels:
-    io.kompose.service: redis
-  name: redis
+  name: defectdojo-tls
  namespace: defectdojo
 spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      io.kompose.service: redis
-  strategy:
-    type: Recreate
-  template:
-    metadata:
-      labels:
-        io.kompose.service: redis
-    spec:
-      containers:
-        - image: redis
-          name: redis
-          resources: {}
-          volumeMounts:
-            - mountPath: /data
-              name: defectdojo-redis
-      restartPolicy: Always
-      volumes:
-        - name: defectdojo-redis
-          persistentVolumeClaim:
-            claimName: defectdojo-redis-pvc
---
-apiVersion: v1
-kind: Service
-metadata:
-  name: redis
-  namespace: defectdojo
-spec:
-  ports:
-    - name: "6379"
-      port: 6379
-      targetPort: 6379
-  selector:
-    io.kompose.service: redis
-status:
-  loadBalancer: {}
---
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: defectdojo-redis-pvc
-  namespace: defectdojo
-spec:
-  storageClassName: ""
-  volumeName: defectdojo-redis-pv
-  accessModes:
-    - ReadWriteOnce
-  volumeMode: Filesystem
-  resources:
-    requests:
-      storage: 2Gi
---
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: defectdojo-redis-pv
-spec:
-  storageClassName: ""
-  capacity:
-    storage: 2Gi
-  accessModes:
-    - ReadWriteOnce
-  persistentVolumeReclaimPolicy: Retain
-  mountOptions:
-    - hard
-    - nfsvers=4.1
-  nfs:
-    server: 192.168.2.110
-    path: /mnt/nfs_share/defectdojo/redis
-    readOnly: false
-
-
+  entryPoints:
+    - websecure
+  routes:
+    - match: Host(`defectdojo-dev.allarddcs.nl`)
+      kind: Rule
+      services:
+        - name: nginx
+          port: 8080
+  tls:
+    certResolver: letsencrypt
@@ -0,0 +1 @@
+microk8s kubectl logs deploy/uwsgi -n defectdojo --follow
@@ -0,0 +1,85 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: defectdojo-postgres15-pv
+spec:
+  storageClassName: ""
+  capacity:
+    storage: 2Gi
+  accessModes:
+    - ReadWriteMany
+  persistentVolumeReclaimPolicy: Retain
+  mountOptions:
+    - hard
+    - nfsvers=4.1
+  nfs:
+    server: 192.168.2.111
+    path: /mnt/nfs_share/dev/defectdojo/postgres
+    readOnly: false
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: defectdojo-postgres15-pvc
+  namespace: defectdojo
+spec:
+  storageClassName: ""
+  volumeName: defectdojo-postgres15-pv
+  accessModes:
+    - ReadWriteMany
+  volumeMode: Filesystem
+  resources:
+    requests:
+      storage: 2Gi
+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: postgres15
+  namespace: defectdojo
+spec:
+  serviceName: postgres15
+  replicas: 1
+  selector:
+    matchLabels:
+      app: postgres15
+  template:
+    metadata:
+      labels:
+        app: postgres15
+    spec:
+      containers:
+      - name: postgres15
+        image: postgres:15
+        ports:
+          - containerPort: 5432
+        env:
+        - name: POSTGRES_DB
+          value: postgres
+        - name: POSTGRES_USER
+          value: admin
+        - name: POSTGRES_PASSWORD
+          value: Pgadmin01@
+        volumeMounts:
+        - mountPath: /var/lib/postgresql/data
+          name: postgres
+      volumes:
+      - name: postgres
+        persistentVolumeClaim:
+          claimName: defectdojo-postgres15-pvc
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: postgres15
+  namespace: defectdojo
+  labels:
+    name: postgres15
+spec:
+  type: ClusterIP
+  ports:
+    - port: 5432
+      name: postgres
+  selector:
+    app: postgres15
+
@@ -0,0 +1,42 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: redis
+  namespace: defectdojo
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: redis
+  template:
+    metadata:
+      labels:
+        app: redis
+    spec:
+      containers:
+        - name: redis
+          image: redis:8.0
+          command:
+            - redis-server
+            - --save
+            - ""
+            - --appendonly
+            - "no"
+          ports:
+            - containerPort: 6379
+      restartPolicy: Always
+      volumes:
+        - name: redis-data
+          emptyDir: {}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: redis
+  namespace: defectdojo
+spec:
+  selector:
+    app: redis
+  ports:
+    - port: 6379
+      targetPort: 6379
				`@@ -0,0 +1 @@`
				`microk8s kubectl logs deploy/uwsgi -n defectdojo --follow`