diff options
| -rw-r--r-- | dan/ele-media.yml | 2 | ||||
| -rw-r--r-- | inventory/host_vars/ele-media.yml | 4 | ||||
| -rw-r--r-- | roles/elevate/media/defaults/main.yml | 2 | ||||
| -rw-r--r-- | roles/elevate/media/tasks/nextcloud-app.yml | 24 | ||||
| -rw-r--r-- | roles/elevate/media/templates/nextcloud-pod-spec-with-mariadb.yml.j2 | 17 |
5 files changed, 47 insertions, 2 deletions
diff --git a/dan/ele-media.yml b/dan/ele-media.yml index a289cd3b..cf90b2f6 100644 --- a/dan/ele-media.yml +++ b/dan/ele-media.yml @@ -21,5 +21,5 @@ - role: network/wireguard/gateway - role: x509/acmetool/base - role: nginx/base -# - role: monitoring/prometheus/exporter + - role: monitoring/prometheus/exporter - role: elevate/media diff --git a/inventory/host_vars/ele-media.yml b/inventory/host_vars/ele-media.yml index 8ad5a630..7aab28bb 100644 --- a/inventory/host_vars/ele-media.yml +++ b/inventory/host_vars/ele-media.yml @@ -141,9 +141,11 @@ elevate_media_nextcloud_instance: admin: username: admin password: "{{ vault_nextcloud_admin_passwords['media.elev8.at'] }}" + redis: + version: 7.2.1 database: type: mariadb - version: 10.11.4 + version: 10.11.5 password: "{{ vault_nextcloud_database_passwords['media.elev8.at'] }}" elevate_media_nextcloud_memory_limit: 4G diff --git a/roles/elevate/media/defaults/main.yml b/roles/elevate/media/defaults/main.yml index 7ce94480..6fa79922 100644 --- a/roles/elevate/media/defaults/main.yml +++ b/roles/elevate/media/defaults/main.yml @@ -6,6 +6,8 @@ elevate_media_share_gid: "800" elevate_media_nextcloud_db_uid: "801" elevate_media_nextcloud_db_gid: "801" +elevate_media_nextcloud_redis_uid: "802" +elevate_media_nextcloud_redis_gid: "802" # elevate_media_nextcloud_base_path: /srv/nextcloud # elevate_media_nextcloud_storage: # ... diff --git a/roles/elevate/media/tasks/nextcloud-app.yml b/roles/elevate/media/tasks/nextcloud-app.yml index b4047f62..4b7f0f75 100644 --- a/roles/elevate/media/tasks/nextcloud-app.yml +++ b/roles/elevate/media/tasks/nextcloud-app.yml @@ -33,6 +33,26 @@ state: directory +- name: add group for nextcloud redis + group: + name: nc-redis + gid: "{{ elevate_media_nextcloud_redis_gid }}" + +- name: add user for nextcloud redis + user: + name: nc-redis + uid: "{{ elevate_media_nextcloud_redis_uid }}" + group: nc-redis + password: "!" + +- name: create nextcloud database subdirectory + file: + path: "{{ elevate_media_nextcloud_base_path }}/{{ elevate_media_nextcloud_instance_name }}/redis" + owner: "{{ elevate_media_nextcloud_redis_uid }}" + group: "{{ elevate_media_nextcloud_redis_gid }}" + state: directory + + - name: create auxiliary config directory file: path: "{{ elevate_media_nextcloud_base_path }}/{{ elevate_media_nextcloud_instance_name }}/config" @@ -158,3 +178,7 @@ ## nextcloud-occ media.elev8.at config:system:set overwriteprotocol --value='https' ## nextcloud-occ media.elev8.at config:system:set overwrite.cli.url --value='https://media.elev8.at' ## nextcloud-occ media.elev8.at config:system:set default_phone_region --value='at' +## nextcloud-occ media.elev8.at config:system:set redis host --value '127.0.0.1' +## nextcloud-occ media.elev8.at config:system:set redis port --type integer --value 6379 +## nextcloud-occ media.elev8.at config:system:set redis timeout --type float --value 0.0 +## nextcloud-occ media.elev8.at config:system:set redis password diff --git a/roles/elevate/media/templates/nextcloud-pod-spec-with-mariadb.yml.j2 b/roles/elevate/media/templates/nextcloud-pod-spec-with-mariadb.yml.j2 index 026ff7a7..05c1a320 100644 --- a/roles/elevate/media/templates/nextcloud-pod-spec-with-mariadb.yml.j2 +++ b/roles/elevate/media/templates/nextcloud-pod-spec-with-mariadb.yml.j2 @@ -35,6 +35,19 @@ containers: - containerPort: 8080 hostPort: {{ elevate_media_nextcloud_instance.port }} hostIP: 127.0.0.1 +- name: redis + image: "redis:{{ elevate_media_nextcloud_instance.redis.version }}" + args: + - --bind 127.0.0.1 + securityContext: + runAsUser: {{ elevate_media_nextcloud_redis_uid }} + runAsGroup: {{ elevate_media_nextcloud_redis_gid }} + resources: + limits: + memory: "512Mi" + volumeMounts: + - name: redis + mountPath: /data - name: database image: "mariadb:{{ elevate_media_nextcloud_instance.database.version }}" args: @@ -68,6 +81,10 @@ volumes: hostPath: path: "{{ elevate_media_nextcloud_base_path }}/{{ elevate_media_nextcloud_instance_name }}/nextcloud" type: Directory +- name: redis + hostPath: + path: "{{ elevate_media_nextcloud_base_path }}/{{ elevate_media_nextcloud_instance_name }}/redis" + type: Directory - name: database hostPath: path: "{{ elevate_media_nextcloud_base_path }}/{{ elevate_media_nextcloud_instance_name }}/{{ elevate_media_nextcloud_instance.database.type }}" |