From 3a50d78e8575157d8376ea924d750f24fd73c063 Mon Sep 17 00:00:00 2001 From: eric o meehan Date: Sat, 30 Nov 2024 22:31:35 -0500 Subject: [PATCH] v1.0.10 --- tasks/gitea.yaml | 38 +++++++++++++++++++++----------------- tasks/grafana.yaml | 18 +++++------------- tasks/jupyterhub.yaml | 5 +---- tasks/mastodon.yaml | 39 ++++++++++++++++++++++++++------------- tasks/mediawiki.yaml | 19 +++++++++++-------- tasks/nextcloud.yaml | 18 +++++++++++++++++- 6 files changed, 81 insertions(+), 56 deletions(-) diff --git a/tasks/gitea.yaml b/tasks/gitea.yaml index f821600..eae1504 100644 --- a/tasks/gitea.yaml +++ b/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 diff --git a/tasks/grafana.yaml b/tasks/grafana.yaml index 9fa9dfd..64d6ba3 100644 --- a/tasks/grafana.yaml +++ b/tasks/grafana.yaml @@ -13,21 +13,13 @@ user: grafana password: "{{ grafana_admin_password }}" persistence: - size: 32Gi + size: 64Gi grafana: extraEnvVars: - - name: GF_DATABASE_TYPE - value: postgres - - name: GF_DATABASE_HOST - value: postgresql-postgresql-ha-pgpool.postgresql.svc.cluster.local - - 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" + - name: GF_SERVER_DOMAIN + value: grafana.eom.dev + - name: GF_SERVER_ROOT_URL + value: https://grafana.eom.dev/ smtp: enabled: true user: grafana diff --git a/tasks/jupyterhub.yaml b/tasks/jupyterhub.yaml index a8fe584..1df51b6 100644 --- a/tasks/jupyterhub.yaml +++ b/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: diff --git a/tasks/mastodon.yaml b/tasks/mastodon.yaml index b1ede46..a1c0bc9 100644 --- a/tasks/mastodon.yaml +++ b/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 - externalDatabase: - host: postgresql-postgresql-ha-pgpool.postgresql.svc.cluster.local - user: mastodon - password: "{{ mastodon_admin_password }}" - database: mastodon - port: 5432 + enabled: true + global: + postgresql: + auth: + password: "{{ mastodon_admin_password }}" + primary: + persistence: + size: 256Gi + readReplicas: + persistence: + size: 256Gi elasticsearch: - enabled: false - externalElasticsearch: - host: elasticsearch.elasticsearch.svc.cluster.local - port: 9200 + enabled: true + master: + persistence: + size: 32Gi + data: + persistence: + size: 32Gi minio: enabled: false apache: diff --git a/tasks/mediawiki.yaml b/tasks/mediawiki.yaml index 87d1ca4..c094a25 100644 --- a/tasks/mediawiki.yaml +++ b/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 diff --git a/tasks/nextcloud.yaml b/tasks/nextcloud.yaml index 1ad7446..2ff2b3f 100644 --- a/tasks/nextcloud.yaml +++ b/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