remove old nextcloud glusterfs volumes and mounts

.idea/dataSources.xml

@@ -65,7 +65,7 @@
         <property name="autoReconnect" value="true" />
       </driver-properties>
     </data-source>
-    <data-source source="LOCAL" name="postgres: sql.xai-corp.net (mapped)" uuid="a12eef14-05f4-4575-a408-f3b45afbb955">
+    <data-source source="LOCAL" name="postgres: sql.xai-corp.net (mapped)[postgres]" uuid="a12eef14-05f4-4575-a408-f3b45afbb955">
       <driver-ref>postgresql</driver-ref>
       <synchronize>true</synchronize>
       <remarks>forwarded connection to postgres</remarks>
@@ -73,5 +73,21 @@
       <jdbc-url>jdbc:postgresql://localhost:5432/postgres</jdbc-url>
       <working-dir>$ProjectFileDir$</working-dir>
     </data-source>
+    <data-source source="LOCAL" name="postgres: sql.xai-corp.net (mapped) [test]" uuid="aef3d15d-9985-4aa2-8b1d-c6a1ca0da4f3">
+      <driver-ref>postgresql</driver-ref>
+      <synchronize>true</synchronize>
+      <remarks>forwarded connection to postgres</remarks>
+      <jdbc-driver>org.postgresql.Driver</jdbc-driver>
+      <jdbc-url>jdbc:postgresql://localhost:5432/test</jdbc-url>
+      <working-dir>$ProjectFileDir$</working-dir>
+    </data-source>
+    <data-source source="LOCAL" name="postgres: sql.xai-corp.net (mapped) [funkwhale]" uuid="75af28bc-3f8a-4251-87d1-a66f80e00511">
+      <driver-ref>postgresql</driver-ref>
+      <synchronize>true</synchronize>
+      <remarks>forwarded connection to postgres</remarks>
+      <jdbc-driver>org.postgresql.Driver</jdbc-driver>
+      <jdbc-url>jdbc:postgresql://localhost:5432/funkwhale</jdbc-url>
+      <working-dir>$ProjectFileDir$</working-dir>
+    </data-source>
   </component>
 </project>

ansible-5/roles/glusterfs-server/defaults/main.yaml

@@ -27,8 +27,8 @@ volumes:
     - name: mariadb
     - name: plex
     - name: plex-data
-    - name: nextcloud
+#    - name: nextcloud
-    - name: nextcloud2
+#    - name: nextcloud2
 #    - name: prometheus
 #    - name: tmp
 
@@ -37,8 +37,9 @@ volumes:
 
   removed:
     - name: jenkins2
-#    - name: nextcloud
     - name: postgres
+    - name: nextcloud
+    - name: nextcloud2
 
 mounts:
   paths:
@@ -46,7 +47,7 @@ mounts:
     jenkins: /data/glusterfs/jenkins/brick1
     jenkins2: /data/glusterfs/jenkins2/brick1 # dead
     mariadb: /data/glusterfs/mariadb/brick1
-    nextcloud: /data/glusterfs/nextcloud/brick1
+    nextcloud: /data/glusterfs/nextcloud/brick1 # dead
     nextcloud2: /data/glusterfs/nextcloud2/brick1 # dead
     plex: /data/glusterfs/plex/brick1
     plex-data: /data/glusterfs/plex-data/brick1
@@ -68,8 +69,8 @@ mounts:
     - name: tmp
       status: mounted
       src: "UUID=cc7588cc-1d39-4f09-baac-234f8c081443"
-    - name: nextcloud
+    - name: nextcloud # dead
-      status: mounted
+      status: absent
       src: "UUID=617b4eee-7c60-4506-b2c1-7768900482e9"
     - name: prometheus
       status: mounted
@@ -84,7 +85,7 @@ mounts:
       status: mounted
       src: "UUID=cdff8026-1d56-4cee-8c12-8c61dc587850"
     - name: nextcloud2 # dead
-      status: mounted
+      status: absent
       src: "UUID=ced31b8e-8404-4bff-b428-6411c54451a4"
 
   home: []

ansible-5/roles/prod.k3s/defaults/main.yml

@@ -81,7 +81,7 @@ apps:
     state: present
 
   nextcloud:
-    enabled: true
+    enabled: false
     namespace: nextcloud
 
   hello_world:
@@ -90,9 +90,9 @@ apps:
     state: present
 
   funkwhale:
-    enabled: false
+    enabled: true
     namespace: funkwhale
-    state: present
+    state: absent
 
   redis:
     enabled: false

ansible-5/roles/prod.k3s/files/funkwhale/values.yaml

@@ -10,6 +10,7 @@ ingress:
   tls: # < placing a host in the TLS config will determine what ends up in the cert's subjectAltNames
     - secretName: xai-corp-production-tls
 
+replicaCount: 1
 
 postgresql:
   ## If you already have a Postgresql service you'd like to use, set
@@ -17,26 +18,39 @@ postgresql:
   enabled: true
 
   ## External Postgresql hostname or IP
-  # host: postgresql.example.com
+#  host: postgresql.postgres
 
   auth:
     ## Database user
     username: funkwhale
 
     ## Database password
-    password: funkwhale
+    password: 18hbc3u19dhqahgoh910y
 
-    ## Database password
+    ## Database name
     database: funkwhale
 
   ## Database port
-  service:
+#  service:
-    port: 5432
+#    port: 5432
 
 redis:
   ## If you already have a Redis service you'd like to use, set
   ## this to false and adjust the host to use your existing service.
-  enabled: false
+  enabled: true
 
   ## External Redis hostname or IP
-  host: redis.redis
+#  host: redis-master.redis
+
+persistence:
+  enabled: false
+#  existingClaim: data-funkwhale-0
+  # storageClass: "-"
+
+  ## Note; Using ReadWriteOnce for persistence will require the addition of
+  ## a required affinity for the celery worker, as well as the use of only a
+  ## single api replica.
+  ##
+  ## An example is provided for the worker affinity
+  accessMode: ReadWriteMany
+  size: 1Gi

ansible-5/roles/prod.k3s/tasks/deployments/funkwhale.yaml

@@ -38,7 +38,7 @@
       local_action:
         module: kubernetes.core.helm
         release_state: "{{apps.funkwhale.state}}"
-        name: gitea
+        name: funkwhale
         namespace: "{{apps.funkwhale.namespace}}"
         create_namespace: yes
         update_repo_cache: True

ansible-5/roles/prod.k3s/tasks/main.yml

@@ -42,6 +42,10 @@
   include_tasks: deployments/redis.yaml
   when: apps.redis.enabled
 
+- name: deploy funkwhale
+  include_tasks: deployments/funkwhale.yaml
+  when: apps.funkwhale.enabled
+
 #-----------------------------------------------------
 #- include_tasks: mariadb.yaml
 #

ansible-5/roles/prod.k3s/templates/funkwhale/pv-claim.yaml

@@ -0,0 +1,13 @@
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: data-funkwhale-0
+  namespace: "{{apps.funkwhale.namespace}}"
+spec:
+  storageClassName: manual
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 10Gi

ansible-5/roles/prod.k3s/templates/funkwhale/pv.yaml

@@ -0,0 +1,17 @@
+---
+# persistent volume
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: funkwhale-pv-local
+  labels:
+    type: local
+spec:
+  storageClassName: manual
+  capacity:
+    storage: 100Gi
+  accessModes:
+    - ReadWriteOnce
+  hostPath:
+    path: "/opt/data/T2/funkwhale"
+