v1.0.10

tasks/gitea.yaml

@@ -65,26 +65,30 @@
           service:
             DISABLE_REGISTRATION: true
             DEFAULT_ALLOW_CREATE_ORGANIZATION: false
-          database:
-            DB_TYPE: postgres
-            HOST: postgresql-postgresql-ha-pgpool.postgresql.svc.cluster.local
-            NAME: gitea
-            USER: gitea
-            PASSWD: "{{ gitea_admin_password }}"
-          session:
-            PROVIDER: redis
-            PROVIDER_CONFIG: "redis+cluster://:{{ redis_auth_password }}@redis-redis-cluster.redis.svc.cluster.local:6379"
-          cache:
-            ADAPTER: redis
-            HOST: "redis+cluster://:{{ redis_auth_password }}@redis-redis-cluster.redis.svc.cluster.local:6379"
-          queue:
-            TYPE: redis
-            CONN_STR: "redis+cluster://:{{ redis_auth_password }}@redis-redis-cluster.redis.svc.cluster.local:6379"
       redis:
-        enabled: false
+        enabled: true
+        global:
+          redis:
+            password: "{{ gitea_admin_password }}"
+        master:
+          persistence:
+            size: 32Gi
+        replica:
+          persistence:
+            size: 32Gi
       redis-cluster:
         enabled: false
       postgresql:
-        enabled: false
+        enabled: true
+        global:
+          postgresql:
+            auth:
+              password: "{{ gitea_admin_password }}"
+        primary:
+          persistence:
+            size: 256Gi
+          readReplicas:
+            persistence:
+              size: 256Gi
       postgresql-ha:
         enabled: false

tasks/grafana.yaml

@@ -13,21 +13,13 @@
         user: grafana
         password: "{{ grafana_admin_password }}"
       persistence:
-        size: 32Gi
+        size: 64Gi
       grafana:
         extraEnvVars:
-          - name: GF_DATABASE_TYPE
+          - name: GF_SERVER_DOMAIN
-            value: postgres
+            value: grafana.eom.dev
-          - name: GF_DATABASE_HOST
+          - name: GF_SERVER_ROOT_URL
-            value: postgresql-postgresql-ha-pgpool.postgresql.svc.cluster.local
+            value: https://grafana.eom.dev/
-          - name: GF_DATABASE_NAME
-            value: grafana
-          - name: GF_DATABASE_USER
-            value: grafana
-          - name: GF_DATABASE_PASSWORD
-            value: "{{ grafana_admin_password }}"
-          - name: GF_DATABASE_URL
-            value: "postgres://grafana:{{ grafana_admin_password }}@postgresql-postgresql-ha-pgpool.postgresql.svc.cluster.local:5432/grafana"
       smtp:
         enabled: true
         user: grafana

tasks/jupyterhub.yaml

@@ -26,6 +26,7 @@
         config:
           Authenticator:
             admin_users:
+              - jupyterhub
               - eric
             allow_all: true
           JupyterHub:
@@ -43,10 +44,6 @@
             lookup_dn_user_dn_attribute: cn
             user_search_base: dc=eom,dc=dev
             user_attribute: uid
-        db:
-          type: postgres
-          url: "postgresql://jupyterhub:{{ jupyterhub_admin_password }}@postgresql-postgresql-ha-pgpool.postgresql.svc.cluster.local:5432/jupyterhub"
-          password: "{{ jupyterhub_admin_password }}"
       singleuser:
         extraFiles:
           jupyter_notebook_config.json:

tasks/mastodon.yaml

@@ -31,7 +31,7 @@
         LDAP_BIND_DN: cn=readonly,dc=eom,dc=dev
         LDAP_PASSWORD: "{{ openldap_readonly_password }}"
         LDAP_UID: uid
-        LDAP_SEARCH_FILTER: (&(objectClass=posixAccount)(|(%{uid}=%{username})(%{mail}=%{email}))(memberOf=cn=Mastodon Users,ou=Mastodon,ou=Services,dc=eom,dc=dev))
+        LDAP_SEARCH_FILTER: (&(objectClass=posixAccount)(|(%{uid}=%{email})(%{mail}=%{email}))(memberOf=cn=Mastodon Users,ou=Mastodon,ou=Services,dc=eom,dc=dev))
         LDAP_MAIL: mail
       enableS3: false
       localDomain: mastodon.eom.dev
@@ -52,20 +52,33 @@
       redis:
         enabled: true
         auth:
-          password: "{{ redis_auth_password }}"
+          password: "{{ mastodon_admin_password }}"
+        master:
+          persistence:
+            size: 32Gi
+        replica:
+          persistence:
+            size: 32Gi
       postgresql:
-        enabled: false
+        enabled: true
-      externalDatabase:
+        global:
-        host: postgresql-postgresql-ha-pgpool.postgresql.svc.cluster.local
+          postgresql:
-        user: mastodon
+            auth:
-        password: "{{ mastodon_admin_password }}"
+              password: "{{ mastodon_admin_password }}"
-        database: mastodon
+        primary:
-        port: 5432
+          persistence:
+            size: 256Gi
+        readReplicas:
+          persistence:
+            size: 256Gi
       elasticsearch:
-        enabled: false
+        enabled: true
-      externalElasticsearch:
+        master:
-        host: elasticsearch.elasticsearch.svc.cluster.local
+          persistence:
-        port: 9200
+            size: 32Gi
+        data:
+          persistence:
+            size: 32Gi
       minio:
         enabled: false
       apache:

tasks/mediawiki.yaml

@@ -11,7 +11,7 @@
       mediawikiPassword: "{{ mediawiki_admin_password }}"
       mediawikiEmail: mediawiki@postfix.eom.dev
       mediawikiName: MediaWiki
-      mediawikiHost: https://postfix.eom.dev/
+      mediawikiHost: https://mediawiki.eom.dev/
       smtpHost: postfix.eom.dev
       smtpPort: 587
       smtpUser: mediawiki
@@ -20,12 +20,6 @@
         size: 32Gi
       service:
         type: ClusterIP
-      externalDatabase:
-        host: postgresql-postgresql-ha-pgpool.postgresql.svc.cluster.local
-        port: 5432
-        database: mediawiki
-        user: mediawiki
-        password: "{{ mediawiki_admin_password }}"
       ingress:
         enabled: true
         annotations:
@@ -36,4 +30,13 @@
         path: /
         tls: true
       mariadb:
-        enabled: false
+        db:
+          name: mediawiki
+          user: mediawiki
+          password: "{{ mediawiki_admin_password }}"
+        master:
+          persistence:
+            size: 256Gi
+        slave:
+          persistence:
+            size: 256Gi

tasks/nextcloud.yaml

@@ -47,7 +47,7 @@
       externalDatabase:
         enabled: true
         type: postgresql
-        host: postgresql-postgresql-ha-pgpool.postgresql.svc.cluster.local
+        host: nextcloud-postgresql
         user: nextcloud
         password: "{{ nextcloud_admin_password }}"
         database: nextcloud
@@ -67,3 +67,19 @@
           - hosts:
             - nextcloud.eom.dev
             secretName: nextcloud-tls
+      cronjob:
+        enabled: true
+      redis:
+        enabled: true
+        auth:
+          password: "{{ nextcloud_admin_password }}"
+      postgresql:
+        enabled: true
+        global:
+          postgresql:
+            auth:
+              password: "{{ nextcloud_admin_password }}"
+        primary:
+          persistence:
+            enabled: true
+            size: 256Gi