v3.12.0

2025-09-12 23:48:03 +02:00 · 2025-09-12 23:48:03 +02:00 · e0e377cac5
commit e0e377cac5
parent d0a13fba03
8 changed files with 31 additions and 21 deletions
--- a/21
+++ b/21
@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 Ocelot.Social Community
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
--- a/LICENSE.md
+++ b/LICENSE.md
@ -1,11 +0,0 @@
-# LICENSE
-
-MIT License
-
-Copyright \(c\) 2022 by the [Ocelot.Social Community](https://github.com/Ocelot-Social-Community)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files \(the "Software"\), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--- a/branding/data/.gitkeep
+++ b/branding/data/.gitkeep
@ -1 +0,0 @@
-we can put multilanguage e-mails and a layout.html in here
--- a/branding/middlewares/.gitkeep
+++ b/branding/middlewares/.gitkeep
@ -1 +0,0 @@
-we can put multilanguage e-mails and a layout.html in here
--- a/branding/public/.gitkeep
+++ b/branding/public/.gitkeep
@ -1 +0,0 @@
-we can put multilanguage e-mails and a layout.html in here
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -1,6 +1,6 @@
 services:
  webapp:
-    image: ghcr.io/IT4Change/wir.social/webapp
+    image: ghcr.io/it4change/wir.social/webapp
    build:
      context: .
      dockerfile: ./docker/webapp.Dockerfile
--- a/helmfile/secrets/ocelot.yaml
+++ b/helmfile/secrets/ocelot.yaml
@ -7,7 +7,6 @@ secrets:
        env:
            JWT_SECRET: ENC[AES256_GCM,data:p362NdtUbslXOxGLC/r24x9C2nuFLTYwtRhw3jorf6WITic=,iv:1CyuYcSLogeHEnJgSecv8SqghQKgoh5qROETJmMdITU=,tag:6nGxZe/l+tyCIsqAV9DfYg==,type:str]
            MAPBOX_TOKEN: ENC[AES256_GCM,data:qK6iTYKiWfkvXBodm8zVmfr5ACTTz1+7Pt7Q/hwgv3SYERyo5NyqfsvbVKuDAD90kTCNODpSwUApJE6do/Umedg4s8mrnHXCckIDbX5BztoeHJBehsUC54ELcrQ=,iv:b65yqfdoOX366UXt7HS6nhL8hlZn4l5hQfrhI6NXc+I=,tag:vF48V+TRS5g9ezXhzAJnPw==,type:str]
-            #ENC[AES256_GCM,data:W4AysbCrbgd4JZeJ6SUZUO4/wvTzvgZw0sZC5QxmqcwxBeYg+Cx2UJ5Uqvjm5RPYS1hF,iv:G5B9N8Vvp+UC8M0uuklsv/PE2R8C9L/5u2TkmM9a0yY=,tag:JM2shrci4u2DKKkIfoTj6w==,type:comment]
            #ENC[AES256_GCM,data:W7Z5wOYMkKNZICGo8H2I/1laM9kP3QCE4lfP6pf0uGiKmbmjI3Cfew==,iv:aF2aNs22VwD1qZHfYPBYAHVmhAZx5dybD5rXiQvvu98=,tag:XgL/eXEFi1eQfAHhvQDGBQ==,type:comment]
            EMAIL_DEFAULT_SENDER: ENC[AES256_GCM,data:eSD1niqwE2nFuPQrZAuU,iv:ka7RlRFtKTawRTfu+OKfFcGetSSWycDuBuS/A51zuf8=,tag:hwRepPzXjY/ozzHWgQBQNw==,type:str]
            SMTP_HOST: ENC[AES256_GCM,data:duvCCwr6eau+R2YTrg==,iv:XONqp6s1xeyYC7HucVJhr372FOOAWhJf3CxCPsfxxuU=,tag:ullAeTKQig4eIluDYdNJUw==,type:str]
@ -23,10 +22,14 @@ secrets:
            NEO4J_USERNAME: null
            NEO4J_PASSWORD: null
            REDIS_PASSWORD: null
+            IMAGOR_SECRET: ENC[AES256_GCM,data:6ikN0Oxt8regZSDJYm9IHRmlsCDe1W6DKQ==,iv:Oku9nj3AK0i9FHS8WT99VSHT7l6fIVASf+ngZ6kkq0Q=,tag:EQuZpgZ8zk6Gn6LKysf7QA==,type:str]
    neo4j:
        env:
            NEO4J_USERNAME: ""
            NEO4J_PASSWORD: ""
+    imagor:
+        env:
+            IMAGOR_SECRET: ENC[AES256_GCM,data:B+v9LdupqS52u5QsJt5q/naiVR7PPlnWcA==,iv:Al0UxVfpQuw93shY582U8mmSAaoc8OSu+Dsm9Vx9s6s=,tag:atg2a9ahY4qB4bF7ytWM1w==,type:str]
 sops:
    age:
        - recipient: age1al36hkk8can83zpxq8qyy07gpv83hdw9vchfly5f264kanz405as283a00
@ -83,7 +86,7 @@ sops:
            Tkx0VFJpN1pZam4yeTNYU1Jnb1JyR1EKJSQYyAi9ZZr+njaXV/62nshPVLtWIcLY
            pwP8ikur4tKrbyg7H+/f3+9jPsr2Jw3xxgkeS4GL+DsTwrGDEwoaiw==
            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-09-11T18:52:52Z"
-    mac: ENC[AES256_GCM,data:ywNvWYHky+T09NuJDXr5VWEQTJxHCjNJaugmmgzsh+Si+HqmQ9VEcfp6AUxLQZoSA6RFQ2a+k5AQFSQrR2QXiauaZbqZmhQU7UjjnoIuwPl3AYNg/oAenkSabCmFW/oiC9XAY6yyqY2Iidw/V1DibNLttorDeweATmQ0OpLridU=,iv:4rhVoJAWn9EwkPK4O4rG0zptQDOGVzaSzaXPgPUcUh0=,tag:WNm9q1MfkizgOhG6t5DD+g==,type:str]
+    lastmodified: "2025-09-12T21:42:47Z"
+    mac: ENC[AES256_GCM,data:6aV3JFd07V9HmY0pROAq9bTtKu/Z6FWvdltwU/0BugDDGDCPMrBtwRnRsg1RxwOXj9+mbHwpo+Og8V9iohAiR8pA1lACYA2HvKXFfMy3wuwmnfN/J6m2SIVq2ABq8BG0tC/7RegRiRJxB3qP0dvHOFQFst8brS9FUKwiSylTjZ4=,iv:vxdoWEruXuAozbMsGqG5VP5ND7N2oYBLuhpeF5CBp64=,tag:t5ErSdL8gQJH1hhSFsu7Ug==,type:str]
    unencrypted_suffix: _unencrypted
    version: 3.10.2
--- a/helmfile/secrets/ocelot.yaml.gotmpl
+++ b/helmfile/secrets/ocelot.yaml.gotmpl
@ -1,5 +1,5 @@
 {
-	"data": "ENC[AES256_GCM,data:37wZRCl0o56gozjpELN6m6167qoq/HrH2ez04WBiUQsatlOslblOLWJMbl+OVEA9T32EMxCp9lmwA0hBKVxnhERcDcfDuvlhl2y3Nv0XFQZkBwyo7adNeiIJOV1mTq1BBg9mmT7+de88UVUNhUzAh3OXJKe1l4cbpAQNQAPe4+ajOa11fzVQG41TegunlxAMaqe4bv2/lEJHXYJ9BJ8/2kpmC7QMbZk191fAT6C8dy2dGXEECcgETO23wA70kK4VSWA8PIptnhov9TI6X/AiHSyJqPhn2Oh9UFeA4O0vNkpMLgsbJtDL1lTpz0veA5d2fjXZqFVKwcA5aVTbglPOXlI4wTZq//Puu1URT5bV/B29qzcng0M11O0Xy/zqauJTP/+hBVzn1SZqm67ZSnP4ts3rZKSp8thLecMAhZ46e222SDcxkzvui2pmX5ALtw==,iv:BeyRydKLQPGg6oIx1zoRkYQ8sW2D3m2lbx37eqFKKsM=,tag:RQjQyt1e1yHSvk8Tj1mWGw==,type:str]",
+	"data": "ENC[AES256_GCM,data:/4lCIOCTEaIeW0FnJRJAIHtN80MTP15oCuadGRi10+c7mVTaRZS7oPNhkfYeJOfejDhqU/Ya3m5Ef5NR1HGtm0lFfZTFxSVBQ/3kkQMtyNIGMC5+Bbmzq1ETdsnvdnAPcAKG0gB1cGjVDqshYy3t7v5HvJeOt7uRcNyfeTqSU0WfSWmbrHPKspwJJXNbAOunsjIav5QyNl1ypozyn67+IFgnkwoWRa6OsCUy0+xkUhGReGefNpi7qdPCFpJFTFRcL6EP2Sg4wzhhBAudtMFVEM3mffjvZkBXRKlXOhHGoKvov4WiVpEfWzMz24BvxnK68W+KNpcljjIv43ZAQrWC5VQJCkpjAD0c2cXoQNSco+/S5sI7BuNXJrI6CRoN3EZuxuJVHNPW35nBnRRT0wxlnxaaZd1xO+UDSafEXopXdBFTzsLjkIPScUjiy6fh7i5ExjYqBdbvEqSbDmSXF4AJ/jSqhS/BcYmu5M447oRX2glr/Y3hog763T77r9FUZ+bSXlLtBTCT9903zXbsJPaDhF4F2PAL7g+Xdc81ehwPgpYuhSzrYpCcok1osljPszXUmM8cACtqdsQI2AiAMJW5qZLV26mPZ+3vnn+lYtJPnDbfx6PZA2FdSTNsSX2ehCm1xdmyVFDwGykmNImQqQe489rrQOK5M/wTyyRsdpC0l5+q24krt+V1MweryowlKoAjjT16+iYGxgCdAeop7NLkihd1DlfD1sni10TDc/zFPUvBaLMC08LT3NiH4dkdtCGCbHiVCOc8cNu8kXH9FtuVB3Wma5iuN4+UovV4w+Y5I8MUIEFi9wkinbE9rn7TlKjOQM8bHf/4XOTo5zVh+0Q3Y8qHIvDLX+qpEzX+mS5pEKrSh7qLOMJ2tqV2y8zeXS2fYcX/S6INWtzDUH0T30Ke/0mayMxNWdmG4URtyW5LnnnjUQquKZb9xTAdGHiNv30aUxZY,iv:uyvgUN9Yj8HM363ORr6acjoDDXJaTrv/a0TKYypE/jk=,tag:H+/YV4dHdAof6UmIoX6hEg==,type:str]",
 	"sops": {
 		"age": [
 			{
@ -31,8 +31,8 @@
 				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBuNVQwUm9uczZWUmNDVTJJ\nWTVTRzZuR21WM3BhYWhRQXREOVd2c3lWMjNFCjVTU0tueFdDOUovdWh1S1V6emE1\na1lQLy9CckhMek1DRGJ4dUp2WWRVR00KLS0tIFJ2S2NERmM4ZXZBR01NeEcyTG9y\nWXJLMGZWWEwrVlVQU2JLbENJYkl6UUUK8Eg7QJEXItW1MBMG2OIRNg20wnKpPFv5\nZxjO/rhmp2Do/DX6I4t7uMX/3VjHunUDPDPscmLEUf4Xj2szJAEosw==\n-----END AGE ENCRYPTED FILE-----\n"
 			}
 		],
-		"lastmodified": "2025-07-06T09:11:29Z",
-		"mac": "ENC[AES256_GCM,data:bLtn5gSp0aUyxnTHQ2pHhqRzuaO9VDIp5KMsZmvzDNttj2UwyCeE4dLPK8nGxb/JD0QCc1SjM0wy91K3H1ZkLEtnEirPrOztBc/i41IosV9mkABR8Girz9c99VqxrrcVCP8hddzFA2qnCmkdQtZX06Xsw3rlFEQb+a8+mfHAfJc=,iv:XJci4piynXVNBFu0m6gILJGV+lsI1g5fwWg60C3oR3U=,tag:dxkHsJK+vJY/hPWt3rGWgg==,type:str]",
+		"lastmodified": "2025-09-12T21:36:47Z",
+		"mac": "ENC[AES256_GCM,data:9w2M+JyZRU0Wgb2lq3BKcaJ4GyYpFQgPWHCoUdSxVPrfpJzwCkaZRKBwCTq3nwa+XaW6fidGki247GTgKU8kDk9YFiID02EDFD/uKoWuiShuZf58rVbMIR8wWJChhegiQW+nvw9pClNYOZAEYkmDnCKYT+ZNB+ka1qr6OOmZMWk=,iv:uQ+HEi7bxZThfzymANryJbKruZxNDQWo0v3ZA5UNz+4=,tag:quLn3jV62XDOrAtlmJtgSg==,type:str]",
 		"unencrypted_suffix": "_unencrypted",
 		"version": "3.10.2"
 	}
				`@ -1 +0,0 @@`
				`we can put multilanguage e-mails and a layout.html in here`