feat(pgadmin): added pgadmin service

files/monitoring/prometheus.sops.yaml

@@ -72,11 +72,16 @@ scrape_configs:
     - job_name: ENC[AES256_GCM,data:QGWa8T6oIyc=,iv:Qqo8i/13R9TUvbxE+QZ98EjMA5HU0Nk2bqEiSsPx/F8=,tag:vj9I16bmvmFKL2MGMGIBgQ==,type:str]
       static_configs:
         - targets:
-            - ENC[AES256_GCM,data:rdUe5RK3k97WypXfPmE=,iv:7sC+7iTtRtQPMcWPlmfPCeq6cW1kW+cP/J4qh/tI3Ks=,tag:PX/clWoY4exh4cuHsdJGYg==,type:str]
+            - ENC[AES256_GCM,data:i9o5wZRqQVcaeSoteMk=,iv:hnLMolp+iXRovNrjJLSyOlFG4x/Tja8jYLQfbRZJOcw=,tag:Hi2DKMilVk0vByC1tsOp8w==,type:str]
       relabel_configs:
         - source_labels:
             - ENC[AES256_GCM,data:UTjyTBJVkQQ4X2c=,iv:RzKu+kWn5FQaLkmNdHKC1U3mu07rFj3+1greEr0GwCU=,tag:eu2ZiaipQsthl8Lroc+/DQ==,type:str]
           target_label: ENC[AES256_GCM,data:qJ89N+9vpDvkJ9hZSUA=,iv:fRxoyMccKBVKwHx+JbMEH0UsL2yFHcRKvmgcnQUbaOY=,tag:mvW77l7B54uz8NRyNsgJKA==,type:str]
+        - source_labels:
+            - ENC[AES256_GCM,data:9Hp4uXbd0H30EtD8Q/g=,iv:HcakCAG2B135EBt+1sc9A1cVXTT65MJ/11kVdvHKmZE=,tag:MncsrERzPX0T1mxjMC/AMQ==,type:str]
+          target_label: ENC[AES256_GCM,data:O1/d6SkBthw=,iv:q65ewsxy5xcr0LCgyQrthbxQv09dBXIBujs4BbM5puI=,tag:uDzYoTLvYpseREGK+1VYsQ==,type:str]
+        - target_label: ENC[AES256_GCM,data:Zy1q5FtJM60K2cM=,iv:yP6VVjOH8MFDgD4hpQ59xECReX7jsdOIdwnB2/E5V+s=,tag:JS6nu30Ks3zmf45rYgyBUA==,type:str]
+          replacement: ENC[AES256_GCM,data:+FMMpPdLxUeUFXTb07o=,iv:Jo21HD5m3Kq5+GRy8yOClYZ3H8uW/61JleheF/XoDmg=,tag:lJjdjsE2t3St1GMaUOargQ==,type:str]
     - job_name: ENC[AES256_GCM,data:3y6JuxM=,iv:NCJm9+M/uGV/Uxlvd5SvN9aHHTQo3Wqn2rr4S+kguRQ=,tag:utGWTyyQooyIKC9JwRwo5g==,type:str]
       bearer_token: ENC[AES256_GCM,data:nzFpWhcj560kqnWHpoj82b388NzvKwJjBLYzf1FEP1/A9KPU6rATqc92hC9NyqCEUBubjUjqp56jTm5lqGI6CnjC1HCQSaOzbX4fGh5zcDBbhFGxVR0zsPQi3fKVqyJcRpeBjB1diq4ieWFhBWG6fzvMuyODrXGeB8jEYFBbK0ZVRTGKsUIiKjqo+F9MPsnYBOznFdKT+lBWLKzZaTY/dqXmPPSMmvZot7sWycXzR/36UR7zHF3RdVRJ0SAv8nKW5yYAiVR0UNmxjEGlvoIjOkRypmQ=,iv:1papuVWEIUiW+eah4RwuNikTxAl1W4bIoosaJTYzv1I=,tag:ZfX8bV7Q1XLu0xbVgARY7A==,type:str]
       metrics_path: ENC[AES256_GCM,data:Jkurz7caN7gIGhSS/dRiBeaKDAVwrQ==,iv:tfEw9/ynfz3Hg7EEpSlbDIlrS8DBmugIU+S3Rn6mcJI=,tag:YxwPGqq3aOq2BVwcneRFyw==,type:str]
@@ -105,8 +110,8 @@ sops:
             dWF6NXgxMmxwVXJ5SmN3N3lZeGVvR3cKmK3iF+hRnzcKg4bE3MNb539v28xmfJpU
             IpFlzKVaCoh17yMJLtFItag+eRD/FraHHJ01tO328KrB9xP0qV+Btg==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-08-13T14:03:59Z"
-    mac: ENC[AES256_GCM,data:JU+cqJvMH/b+SAni4b6qztRQNykJO45QeAEDRERPbvJ2GPLFKZ8IlxYUeP4Bzt+tOBwGw/Ha0jCDMcg2NzKxmPyo7hVTYoYtQtrxVwN0G+8Zr9mD1rH9HC+NZus0CpAm/NI9E3SlaXMN/MmoIpRxSzjGYehCP5Fl8Xq7o9Cuy70=,iv:01zXEvuQ+RM1mWeAIm1KjhSFJrDRCgJnqlmSLZ8vBcs=,tag:FK1DYgjufS2G3M8fxKxm2g==,type:str]
+    lastmodified: "2024-08-14T01:08:17Z"
+    mac: ENC[AES256_GCM,data:49N0jqJ5FmmFTFoiXrSOBUmEYgii4Xd/8CODdWr7wkdGp/94dALtv2E2IUfv2F7F1DSL+Y4uFaY2VbxTdEGbQOp2SvtPocn0LuO+lgs25YHEgshdGBoTSOv3R8MLVbyg/dd6NmbY8bEwb+cLzYSPCorN6AyBGk7DA5Z1NcVq3kc=,iv:Dt79z+32UNtgmJyR1zyspsCJNOq0zm4hXvUOdgZS67A=,tag:53g22MqDUs6UZ2Rkcko/Tg==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.9.0

inventory/group_vars/all.sops.yaml

@@ -24,11 +24,6 @@ starship: ENC[AES256_GCM,data:77kttQ==,iv:sg/kSdIWJ3jNsa5DJN6DEoRTJHjL9xmbb3OLjW
 user: ENC[AES256_GCM,data:Kt7hhQ==,iv:nE3oI5jooOeQQTkgWbd2ZLfHVC9HFoPbv1EDbE9GLoM=,tag:6uujnorFwfEz8+YumsXzLQ==,type:bool]
 chezmoi_repo: ENC[AES256_GCM,data:Web9Xz9MXgeoWcYSu18BOLKrzvSKGJLJ5vPP0idERV0L,iv:GYlAJ2S+IJeelYPYzYhYFllC82hbT+Rr2JTJEbC3roQ=,tag:s35geCe/W2MIFkuG16sGpg==,type:str]
 chezmoi_use_age_key: ENC[AES256_GCM,data:eQz6EQ==,iv:lfpXp8mgn1uEHG8VF37d2Z0z4Ua35v7IVEiUkbgDX+E=,tag:kP9PPm/vbmUr0futqS7eeg==,type:bool]
-postgres_user: ENC[AES256_GCM,data:tYsUtIMzWn4=,iv:5IIiG25UWaPR4bFvsJDj42h04mayvZrCwuDjjZVXeGg=,tag:YRjAOBh7qCoJTlqwyqwYDg==,type:str]
-postgres_password: ENC[AES256_GCM,data:wi7RI39Qn/UkRTNCEaQ53EBp442XnEeQo96k7XNn7bI=,iv:GKL+SP570chivyWuAk5FlgP4pr9B7iMA3VugKaKAdIo=,tag:Hw4tJEzgW3HdMkcc3kdobA==,type:str]
-postgres_db: ENC[AES256_GCM,data:dqUAqWNgPRM=,iv:rf4vQtdnLdDRqaZ8xzSmD+xDJ8vQ1BUio71d7/ZoJM0=,tag:twH223WouLnIGQVIBJF23Q==,type:str]
-postgres_port: ENC[AES256_GCM,data:lidqlqDHMdkI,iv:zlaCnZ0IWsAWZ8byU11z7gpbHLcFxebWgykPJ+Ul2YI=,tag:2w5q6QLeASTF65lv3HB4mA==,type:str]
-postgres_data_dir: ENC[AES256_GCM,data:6fg9MJs3NxxrR0M3lA==,iv:Y2POdXpjuIQFBHXZMzjWXin/FhmQLpi3dre/OejpoCg=,tag:XErP4JghIZSNFBWdvY9sCg==,type:str]
 cloudflare_email: ENC[AES256_GCM,data:J/GnY73/2CbjXApTWUw=,iv:Tzi4qOirjMy2ZilORVWBDwRhR79NwohsdNcMFurjym0=,tag:tIndJizd1FyOanR6DnhYtg==,type:str]
 cloudflare_token: ENC[AES256_GCM,data:5VCB2sO8Y5UvqyUhB+sLCX5IXoRIzmjDMfZZPr7q1KzDA6DOkyy2jA==,iv:kGOwZbD/UP0KbNTYJIm0sW/u23Lsoh4aln790tozsbk=,tag:p/FIvSllM862+gAAKsYd3w==,type:str]
 docker_network: ENC[AES256_GCM,data:T0NGCA==,iv:T+dcUCogUAU0A72NvNfMW2s8kN3yCmAhd4lncEhTop0=,tag:AsZt9osDZtdPOtR8pQziaA==,type:bool]
@@ -65,8 +60,8 @@ sops:
             TVU3M2RpbVgvNFJoWXA0MURuU3hJZWMKOOJvuAydZAso2TvBgC2TmZVyCf9wPNiJ
             YfTPOncFn6d8HJEtSgZpREhsxI25YnhfhCcYSuZA9OohQ6j79c0v+g==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-08-12T17:21:59Z"
-    mac: ENC[AES256_GCM,data:gqRR7/jJY8jdyuL7wPUSA/4JgxCJoSvs0d2w/gKg79k6KTgVnfjbRyW8jxj+SDNf4iaQHKhgcmKUzs2aBbd4oc8ruDUh1G7B5bZnRIn0Zn2TA0fBPIqXD0ShGDMwH4JAh8Q8arhvYe/z6/bd56kwe7Q0U5W7tUTWd4kw1JpofP0=,iv:B0X7SpdDKsfasDC3jFWrychfU1Qd/RqN6d3UqMgRnH4=,tag:cK9CPMTKirgjFnoY4KLrYA==,type:str]
+    lastmodified: "2024-08-14T00:53:51Z"
+    mac: ENC[AES256_GCM,data:UJBkD0HBPf4VZGmZzJvjggZEKlQ4mPiYE+CE9UcOwtPvVEY0pGlDJOVDfa0Uodl9/Di6h/AnHG/OQQw9Z13/aEjGPfGYPL73adnera8da1ML/Icnv7jk9WHxSRUjHz50p1TOxG6iqoeee7dM5+htMFQdfBGj/9VWwhTmiLwWayw=,iv:95NFZ9CTsaxZzDisxJHkvOP2mBVM4C/eZcZvl7WF7mY=,tag:2va7EQ2nJKRrNKo+5l/9YA==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.9.0

inventory/group_vars/nextcloud.sops.yaml

@@ -0,0 +1,39 @@
+nextcloud: ENC[AES256_GCM,data:Vk7UbQ==,iv:8g14EB3sUEm9tMMsQDXl6vW33D+58jD2PBL4dYvU/pE=,tag:n7MK4kdeoAUfotAzfi8E6g==,type:bool]
+nextcloud_env:
+    POSTGRES_HOST: ENC[AES256_GCM,data:BJn6Pny/J3Qg,iv:q6QXTQoB4TJRBVfcgSgJnLK3s4+3t7FVoyLwRhNV0Vo=,tag:anOJFvfu0n05b5EYX0sTjA==,type:str]
+    POSTGRES_DB: ENC[AES256_GCM,data:9lwk74CAOihF,iv:C55ZTiSafD+JWLWQRCVEscPyLTFH542L3nGPwetYHdM=,tag:pIw8aXgobEFgiiJ0Nx4wAQ==,type:str]
+    POSTGRES_USER: ENC[AES256_GCM,data:z4SknLRQqbct,iv:ZgmliQmfOlieEIw7PkWF2ISfJaR+rYbVIZGK88GnaHM=,tag:Cle+4UXKn+1W1sJPthzeoA==,type:str]
+    POSTGRES_PASSWORD: ENC[AES256_GCM,data:n/Br2lLrl07qnxlWEo0K/GxAYieBhawXH5oohAY4Rkw=,iv:fv8nL2lkzlJwZ3KtGcj6gDV2nclhfYzN6pcuhDeNW5c=,tag:vJZHYIk74vvP3bEh9Vvi4w==,type:str]
+    NEXTCLOUD_ADMIN_USER: ENC[AES256_GCM,data:LgLa+A==,iv:TNJa8sbcSdmIdlk2yD+BgXHiXGpdy0Mtcwu8WYb5vOQ=,tag:3CDQkZw23Wt89itsI7Nxew==,type:str]
+    NEXTCLOUD_ADMIN_PASSWORD: ENC[AES256_GCM,data:0pcNZwmE6PnNNsFOmNo=,iv:XWvVUVQPH2/pQFUghD9lDDsSQ4IIJzlrTifTN7LR2bE=,tag:Lc9PiJOZmjf2zJCB4Upzhw==,type:str]
+    NEXTCLOUD_DATA_DIR: ENC[AES256_GCM,data:MZtwr5w=,iv:+ZFY8/eIgqOK/gXxqBDxhwfya0Yxam5XWlEe52j5gR0=,tag:Tmb4u3drhtwDK275e57brg==,type:str]
+    SMTP_HOST: ENC[AES256_GCM,data:ZaC23kYILs4oleTaruQ=,iv:SAaRRTI+6Y0H38Hhr3xFjNQ3DYzJ9ySDef2AAl0NdDY=,tag:EEbfq4IuL+Ad/S92fhhfHA==,type:str]
+    SMTP_PORT: ENC[AES256_GCM,data:54ff,iv:5KHRgDQdQSd0nbl8f9xVZGTy7a2A8sAwl6bhEheuM1w=,tag:YUfxFNjh/j7q6ZblB0yUxw==,type:str]
+    SMTP_NAME: ENC[AES256_GCM,data:LQ1l4TheCqIBW4N3+48=,iv:9gNJZmi0Fbgbke94uqSuWCQeSAYAetJxiShbYwWuscE=,tag:DZjK0DgrDkmuYmQrUrAD2w==,type:str]
+    SMTP_PASSWORD: ENC[AES256_GCM,data:0Ty7QlSBAqJGQ7cOXmy1TA==,iv:/zQxz+iasDs0ra8+gMROjzzKW+osNvUHta6YUrSMM/s=,tag:918M6LZbnxZ0KsgwK6BQ5A==,type:str]
+    MAIL_FROM_ADDRESS: ENC[AES256_GCM,data:zvcsr3g=,iv:j6rKLGZn3Tuk2r8s9tYSY/Or1Fo/uB+cTt3wnLkwD44=,tag:fXjvfHRLRaHVw3wNIuH0+Q==,type:str]
+    MAIL_DOMAIN: ENC[AES256_GCM,data:+lLhZSU3x3ntyXc=,iv:wieEvRoQr5GQyKf/BbOr9/xwI+oaSLz5eIefR8Yf+uQ=,tag:5/nynaUy/eCWaeAetrU+uw==,type:str]
+    REDIS_HOST: ENC[AES256_GCM,data:dKnKncso2s3e,iv:hrmLB6e59MDKV7G9FbslK+k9RArN0EC//9xNcXvDob0=,tag:BlfRS7IBo6wwYc0wdAMGDg==,type:str]
+    PUID: ENC[AES256_GCM,data:Npfn3g==,iv:uA5nNV2KQbRO/hFzM5ZH7YtMUb7PUPKxh/LNalvIfNE=,tag:fQN1vXUhrqjtfPuzDVzOWw==,type:str]
+    PGID: ENC[AES256_GCM,data:Vj3kTQ==,iv:M9/iPaJ8ig3gJamAZTLt/4eqXEn2MwEyxHIWJ6v0PZk=,tag:+XLFK8e1Exd6wZdYdG5eeg==,type:str]
+    TZ: ENC[AES256_GCM,data:MyJ5EMl4Mmr+bC35+w==,iv:EdVozvuXNQpdOCw2VshymJWORmCHE5OVxgM+Nci01e4=,tag:tjmRH34ygJIcalNQts0gpg==,type:str]
+sops:
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
+    age:
+        - recipient: age13n6rctev7vwr2vuds9uqdh6anhvdvl2zt8gu9jp6mmvw2wukuqmqxz9ghv
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjRlpSZGxjR1prbjgyeFdB
+            NFhOblgrUjYzbDVIYTRkOGpCYUpTaDBxVFhZClM5ZmxGai9IaGRQQjRqV2hMSnN5
+            N0pkaVRGWU40SmpsZk14eG11UG52eUEKLS0tIGtReFZrWkRHZ2JycEZRR05jcUVJ
+            cXFQSERNUmdUNWZEVkxJVTZhbklCb2cKgFB3UAphLa93eAgJ29v9pSDKgQmopPEI
+            UTmgq9CHlSKYjOP2AatgMs7iWCYRigYEPAEzOC7XtqSMbM5s9qiiSQ==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2024-08-13T14:36:38Z"
+    mac: ENC[AES256_GCM,data:YzImFGfz686eOOShFt8gqXkMp4krGi8N/GZ2IonSH0qhvflfdETjHZoBGLzr5oTDmR2JJ786Lsh7eb2KiczEGTP/c9YGHCdj/2luHqRFUpxhtZlBejaN/kfnHjOdZfPZiJTLqOT5oOJNrDf5A6QMs3vMxEkfTI47CLZKjTPiy0o=,iv:aWh+4CgjePlCfHuv7tOXg88arVkmWtYHzl1PmMe4PfQ=,tag:CCsqd535qG/jAml0AZ6Kfg==,type:str]
+    pgp: []
+    unencrypted_suffix: _unencrypted
+    version: 3.9.0

inventory/group_vars/pgadmin.sops.yaml

@@ -0,0 +1,25 @@
+pgadmin: ENC[AES256_GCM,data:10xt6w==,iv:aqyFNmA3aDm6cEITL4wZgT2uLwav89orfUrhyyTAk8s=,tag:+gMO9yG+whr0+xOzKa9/1w==,type:bool]
+pgadmin_dir: ENC[AES256_GCM,data:px74ph0jFzGTETQp,iv:AZrZpihIN6xaOSMf5AWFNWFsVy7Vlp2zYVTZseh3u4w=,tag:DnFnjMmuH6O4lazjFOJGIA==,type:str]
+pgadmin_env:
+    PGADMIN_DEFAULT_EMAIL: ENC[AES256_GCM,data:2qDEWg+N0n70Ec0AXlM=,iv:oopkAMTfV4Ak88v8aFF6sSX+4SPpu214giF54tJMMU8=,tag:KloPEPARi1w7nIi1KI2Ytg==,type:str]
+    PGADMIN_DEFAULT_PASSWORD: ENC[AES256_GCM,data:MmHx4DYAnEPYfgZgFq4=,iv:IyI7ygZ4z68peB9qnK+legMZ5/kJgsk0URWZGlBbaZ4=,tag:Oa4Y8j+5rJkwyZmCr6rFMA==,type:str]
+sops:
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
+    age:
+        - recipient: age13n6rctev7vwr2vuds9uqdh6anhvdvl2zt8gu9jp6mmvw2wukuqmqxz9ghv
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBWQnMrUFVYbVM1VjRucjdV
+            bi9HYVFUd25SQllUcXlyN1FkQ1hRQi8yVFR3CmhkbnovQ0NXZzNwaWxaYitydXl1
+            bHMzY0Y0Skl3emZtaUFsRERLbDJPQzgKLS0tIGVIb3FpK2xmMWlwYzVlOXRVMElQ
+            cVRnNnc4dWJOS1RBa3Q0ZU1oYjgwbEkKKTYClFDKIH0Zy9dyUgd5A1R0KJx0Pb9X
+            aJ7mUX6QphI+ihttUW5ub+7Kdp5QMsX0veXKmf+UkDMWyTQxr41TTg==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2024-08-14T00:22:43Z"
+    mac: ENC[AES256_GCM,data:4IJ8v41x68vZD7sJXHYKhAhZDwEGCM7U5GWTJW72B4SUqtdfH+zwQXEC24/c0i0shP2YBbWEE4dEiVUctMJF0JGa3oDrwpXqnEaTCIV1HrAwRTJCi/tCueau6Ff5TiHD4DryOVrr/kcJEfvjslmDzFTlKslSDJ8Eb/kkg5+N0HU=,iv:eKRqHAX1BOeSFk44okRVy8oGvMwwN+zg3oZEKGYwESY=,tag:Dt4oQsVxycrSDBiXcvffPA==,type:str]
+    pgp: []
+    unencrypted_suffix: _unencrypted
+    version: 3.9.0

inventory/group_vars/postgres.sops.yaml

@@ -0,0 +1,26 @@
+postgres: ENC[AES256_GCM,data:atxLAQ==,iv:erpDv40PZQWbYaWhL8waEOPxEWGFsPuXJIEzbAs7p7E=,tag:2GPtf034QNblXD/taYwo3w==,type:bool]
+postgres_user: ENC[AES256_GCM,data:FnVhM9aYNEg=,iv:UNvZ/5kUtkRkOmvFeSWF4SSRYkNryOH04PGjZd6vgHo=,tag:rZgWQLVMOu6AFTzGbsAq3A==,type:str]
+postgres_password: ENC[AES256_GCM,data:7px8Eyl15EaLVX40RwORzb5MTDGUAPWAZyMmZv9A4VE=,iv:HTNftstf9o1ti7SSCz3yORlCDiDRPXEBe93ebS+qzgI=,tag:CZh9H4SAu3tAXv3jUBu+hA==,type:str]
+postgres_db: ENC[AES256_GCM,data:7XGB2oh3HzE=,iv:pxDCXll6KF57U0bnB7e2PZk2LZNZBoUYceerLHyw1FY=,tag:5phfodF40NBG5mVRhKHHpg==,type:str]
+postgres_port: ENC[AES256_GCM,data:hAd+WDGCDEJ6,iv:WOfBOZ04KkRd5S3dfJZbiJ0J+Dygv7XT/G9XfKjBaFM=,tag:YwNbedzUa7EMRfNThUb+Rg==,type:str]
+postgres_data_dir: ENC[AES256_GCM,data:hLFkJGWPqC0G0wR3Lw==,iv:omjj9mgTorVuEEOYccezCkLTBziGj3CL0fzenwcI75w=,tag:GnYyLjiWdvFIVyEFTwjzJw==,type:str]
+sops:
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
+    age:
+        - recipient: age13n6rctev7vwr2vuds9uqdh6anhvdvl2zt8gu9jp6mmvw2wukuqmqxz9ghv
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAzZFA4bmdHaHlRdmhnOFI0
+            WGxpRmVDQzFUQ01vc0Z1TDNXb3g0cVNaZ21jCnVvRDNFc0daV1pHMzY3ZHYwdVZy
+            Wm1CRFJnZ3gvOXFuNmxIVTJBaTBsWG8KLS0tIERrYnkyb3BHVHowc3VkQWp4QmRW
+            UnRLYWF4ZDNnOFlSdmpMZ09GQXZPbGsKOU+JfVWsmp5i0XhAr5ruuaUAYlyXECHd
+            yoAX2DKFapr49lAsjFbFgK+LyiIFoZZTdjgGnlOZ+X9wvTHg1g7ocw==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2024-08-14T01:10:46Z"
+    mac: ENC[AES256_GCM,data:L8fv35mIfh4WdnW2qrRme5iGVvkABa6t2h2AqZsMS8s/m+PNhE2N0eSv+K1SrVNYJLCS4dWgaXAPXt0KCgdjuCEaBDzPPLoqNgr0kr8es18aIgzfzLrx6OAjb0AQd+HqtNwF+5n5N7Ud7JhRTrqR1lCV3Bz1AJBW6vNZFCN9V68=,iv:yVzGF1OsEAoTi9EP/KKiU6W+3b6BdxF7MEtq+kDNXWo=,tag:eYexgrp/gL3Gt873ky+byA==,type:str]
+    pgp: []
+    unencrypted_suffix: _unencrypted
+    version: 3.9.0

inventory/host_vars/hera.sops.yaml

@@ -34,6 +34,8 @@ zfs_datasets:
       properties:
         sharenfs: ENC[AES256_GCM,data:/XY2L8n3WOMftcd7esL35uQxeUStpEhkf7urp+27f4QclnO8QeQRWyej4BAvl8q2Gpp08oSF2OcmRRXL3WQfAd7Oj4I=,iv:hH+qaRN9LXZIPDQEeqYK6mCTuer4q/jMdJmXDUdgXSU=,tag:BvR3EcKv0HSM7IQ8n+BNvQ==,type:str]
 minio_dir: ENC[AES256_GCM,data:k57H5edI+zNqfKM=,iv:YZEOCmLY5BlxBXbQK/v/SmDTR1EVJlq4XdREPb5zXzQ=,tag:8DLN4sNbhcFPprX6sPvptw==,type:str]
+nextcloud_config_dir: ENC[AES256_GCM,data:ofSOQOI93T2qo42AduW0SjKS7g==,iv:wUPtdBtSMOsz6ncU0moK6LuksLVpFGXoU2JiSX+Kbus=,tag:jo0YXgxvI088pzpjVyTSmw==,type:str]
+nextcloud_data_dir: ENC[AES256_GCM,data:V2rFl9rn+2Zno+g=,iv:4F0lbr5IWdgKOAZEfWqeW542I0h4rKtsDKydMCahxoQ=,tag:PLD4eOq2T3qjomc+MnJqug==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -49,8 +51,8 @@ sops:
             TVU3M2RpbVgvNFJoWXA0MURuU3hJZWMKOOJvuAydZAso2TvBgC2TmZVyCf9wPNiJ
             YfTPOncFn6d8HJEtSgZpREhsxI25YnhfhCcYSuZA9OohQ6j79c0v+g==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-08-13T10:34:43Z"
-    mac: ENC[AES256_GCM,data:UtAUH2yyWoGKGLlmABe5WCSyDE4ZRQ287qPm62qumKKsywYPi9tDN7IkwmT0kR1blVIvwJfgawdvcw7pNT58PqJjGh6H0U3wCISR2HzAtk/mYgawhqtUZDDl2BGUOFZRa87u6eoeU68GE6haK854KcKUE1pFhLSHlkfZWvaeslk=,iv:lutDWCDdBsUGXJmJMm4E1odvWj0tWIO0KgbMRqDoSsc=,tag:Ypeyrxc9mzHMVqUWTAgmlw==,type:str]
+    lastmodified: "2024-08-13T14:28:42Z"
+    mac: ENC[AES256_GCM,data:KuI7ucrhNzEsxgWImzB+p3GdtRp6q3ORWJOLXh3vTYH1KHe3cVD7xXHYHAvLzHq19TUxspRXxFffiQRsgnrkzWwkMMmyKwRF3sKDorqcXo2t16XcVpDf8mRS4I01olVlPHdlC8uIylCA4FsDoGsGPFSQv80l/HqxM0himTBwP/A=,iv:gou3oSxNVuhRLhcEoB2fHz0z1nWcKNWu40cnK8vbAAU=,tag:hUPnPAqw/JR60h0uegkgJw==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.9.0

inventory/host_vars/mars.sops.yaml

@@ -8,7 +8,6 @@ portainer_edition: ENC[AES256_GCM,data:0Os=,iv:DQnH7kosKZ/EveTTPb2ERlPCxKzWk7kZt
 mosquitto: ENC[AES256_GCM,data:nc4tWA==,iv:sX9qM3BYb7JfXzft1pLjN9EZgfanW9cs0neG3bVMXqU=,tag:1N92hLCeBdNJM5/UBpIPsQ==,type:bool]
 squid: ENC[AES256_GCM,data:W/yevA==,iv:6UYmpKoZ/w93UWrfIMTozuR/qkH/C5PvujzvQxKJ74Y=,tag:kARd+OCby/dZsDARMZUk4w==,type:bool]
 squid_cache_dir: ENC[AES256_GCM,data:VRbJZaGWob4TPg==,iv:iPfehUnY0DDqbHIqNe4IWIMaaZ5eq1S64SzqvTh9PrM=,tag:nCKhGZDDZt9r1Qi6x6AXsg==,type:str]
-postgres: ENC[AES256_GCM,data:bh3kQQ==,iv:6JQEtxoBdruaFzb2b6BSVpq3yqnpvYP319qWCngDf1A=,tag:z7vcRjV0SD2HfsCLomQeGQ==,type:bool]
 hass: ENC[AES256_GCM,data:XtH1Ug==,iv:5S0s0UZ+VGj3VbBYboYfkEyJ0+JlM5vXIZq/ohUgl7g=,tag:wJUb/0dC33dSXZ6bYn64cA==,type:bool]
 backup_hass: ENC[AES256_GCM,data:0zJrQQ==,iv:hnztHUEAdzhKHNzkg+UALI94vzlNt4NmtCx5LCSRIpg=,tag:EL0s7RWpGLexizxNPGSSaw==,type:bool]
 hass_restore:
@@ -31,8 +30,8 @@ sops:
             TVU3M2RpbVgvNFJoWXA0MURuU3hJZWMKOOJvuAydZAso2TvBgC2TmZVyCf9wPNiJ
             YfTPOncFn6d8HJEtSgZpREhsxI25YnhfhCcYSuZA9OohQ6j79c0v+g==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-08-12T14:22:10Z"
-    mac: ENC[AES256_GCM,data:h043EgpNBNfFdszp54t6M1vuOLUT8hBfZ4mG9yIMdC0iqztp5n5iMpT9frmJghLKJ3wcNVxFW8ffQrVn7NgRW6rb+aFCaabmCDGw6K56X3KrlCmiIzzTOvZFe8JWacZUYZX6IOgoeKuTREYphDFhg77EmSasCqOPDmJ2qH69MCs=,iv:rMFUPU5WoHXE9WEj0oAflY+kGiAKXwbrkOgt5IV6b9U=,tag:wES72gBgRZvV6XKhqnpGaQ==,type:str]
+    lastmodified: "2024-08-14T00:54:12Z"
+    mac: ENC[AES256_GCM,data:C02932HwNziVgEA6uYt/E0qneVavQwljceIfWfynkDmhZlXbpiusDvXyewXRfRbs5KFMDEJyytweFWpM+hfy//ounYMPXkjZ4gDsTc7B052XVRQH4BFcNgZDoyvSvLiunv99qLNIWYpqbEnbbQyu28bKG1/6zMSwhIQ4yzAV++k=,iv:ImS67OlUH8jp7exZllHYeLLZJ9CDgO+3hqLbJlI33sI=,tag:BGL1QpTWC2KAJh1bVinwQA==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.9.0

inventory/hosts

@@ -55,3 +55,9 @@ hera
 [dragonfly]
 hera
 mars
+
+[nextcloud]
+hera
+
+[pgadmin]
+mars

roles/service/defaults/main.yml

@@ -3,19 +3,6 @@ squid: false
 squid_cache_dir_config: cache_dir aufs /var/spool/squid 20000 24 256
 
 postgres: false
-# renovate: datasource=docker depName=postgres
-postgres_version: 16-alpine
-postgres_image: "postgres:{{ postgres_version }}"
-postgres_name: postgres
-postgres_user: homeplay
-postgres_password: homeplay
-postgres_db: homeplay
-postgres_data_dir: "/srv/postgres"
-
-# postgres exporter
-# renovate: datasource=docker depName=quay.io/prometheuscommunity/postgres-exporter
-postgres_exporter_version: v0.15.0
-postgres_exporter_image: "quay.io/prometheuscommunity/postgres-exporter:{{ postgres_exporter_version }}"
 
 docker: false
 docker_network_name: homeplay
@@ -121,3 +108,9 @@ grafana_api_key: false
 portainer_agent_port: "9001"
 minio_env: {}
 minio_dir: '/srv/minio'
+
+nextcloud_config_dir: "/srv/nextcloud/config"
+nextcloud_data_dir: "/srv/nextcloud/data"
+
+pgadmin: false
+pgadmin_dir: '/srv/pgadmin'

roles/service/tasks/core/pihole.yml

@@ -44,7 +44,6 @@
     ports:
       - 53:53/tcp
       - 53:53/udp
-      - 1980:80
     restart_policy: always
     networks:
       - name: "{{ docker_network_name }}"
@@ -55,7 +54,7 @@
       traefik.enable: "true"
       traefik.http.routers.pihole.entrypoints: websecure
       traefik.http.routers.pihole.rule: "Host(`pihole.{{ traefik_domain }}`)"
-      traefik.http.services.pihole.loadbalancer.server.port: "1980"
+      traefik.http.services.pihole.loadbalancer.server.port: "80"
 
 - name: Ensure pihole container removed
   when: not pihole

roles/service/tasks/storage/dragonfly.yml

@@ -26,7 +26,21 @@
         name: dragonfly
         image: "{{ dragonfly_image }}"
         ulimits:
-          - memlock:1024:1024
+          - memlock:1024
         network_mode: host
+        restart_policy: always
         volumes:
           - '/srv/dragonfly:/data'
+
+- name: Ensure dragonfly cleaned up
+  when: not dragonfly
+  block:
+    - name: Ensure dragonfly container removed
+      community.docker.docker_container:
+        name: dragonfly
+        state: absent
+
+    - name: Ensure dragonfly persistent dir cleaned up
+      ansible.builtin.file:
+        path: '/srv/dragonfly'
+        state: absent

roles/service/tasks/storage/main.yml

@@ -20,3 +20,17 @@
     apply:
       tags: dragonfly
   tags: dragonfly
+
+- name: Ensure nextcloud tasks included
+  ansible.builtin.include_tasks:
+    file: nextcloud.yml
+    apply:
+      tags: nextcloud
+  tags: nextcloud
+
+- name: Ensure pgadmin tasks included
+  ansible.builtin.include_tasks:
+    file: pgadmin.yml
+    apply:
+      tags: pgadmin
+  tags: pgadmin