From a752c4a7318f0d08fb31598f7f153260e970cfec Mon Sep 17 00:00:00 2001 From: Peter Kurfer Date: Wed, 17 Apr 2024 22:04:33 +0200 Subject: [PATCH] chore: migrate hedgedoc to git-age --- hedgedoc/.gitattributes | 1 + hedgedoc/config/base.env | 38 --------------------------- hedgedoc/config/hedgedoc.env | Bin 0 -> 1850 bytes hedgedoc/kustomization.yaml | 7 ++--- hedgedoc/resources/config.enc.yaml | 40 ----------------------------- hedgedoc/resources/deployment.yaml | 4 +-- hedgedoc/secret-generator.yaml | 11 -------- 7 files changed, 4 insertions(+), 97 deletions(-) create mode 100644 hedgedoc/.gitattributes delete mode 100644 hedgedoc/config/base.env create mode 100644 hedgedoc/config/hedgedoc.env delete mode 100644 hedgedoc/resources/config.enc.yaml delete mode 100644 hedgedoc/secret-generator.yaml diff --git a/hedgedoc/.gitattributes b/hedgedoc/.gitattributes new file mode 100644 index 0000000..6c2aef3 --- /dev/null +++ b/hedgedoc/.gitattributes @@ -0,0 +1 @@ +**/*.env filter=age diff=age merge=age -text diff --git a/hedgedoc/config/base.env b/hedgedoc/config/base.env deleted file mode 100644 index d2265e3..0000000 --- a/hedgedoc/config/base.env +++ /dev/null @@ -1,38 +0,0 @@ -CMD_DOMAIN=md.icb4dc0.de -CMD_URL_ADDPORT=false -CMD_PROTOCOL_USESSL=true -CMD_USECDN=false -CMD_SESSION_LIFE=1209600000 -CMD_HSTS_ENABLE=true -CMD_HSTS_MAX_AGE=31536000 -CMD_HSTS_INCLUDE_SUBDOMAINS=false -CMD_HSTS_PRELOAD=true -CMD_CSP_ENABLE=true -CMD_ALLOW_GRAVATAR=true -CMD_RESPONSE_MAX_LAG=70 -CMD_ALLOW_FREEURL=false -CMD_FORBIDDEN_NOTE_IDS=robots.txt,favicon.ico,api -CMD_DEFAULT_PERMISSION=editable -CMD_ALLOW_ANONYMOUS_EDITS=false -CMD_ALLOW_ANONYMOUS_VIEWS=true -CMD_ALLOW_PDF_EXPORT=true -CMD_DEFAULT_USE_HARD_BREAK=true -CMD_LINKIFY_HEADER_STYLE=keep-case -CMD_AUTO_VERSION_CHECK=true -CMD_ALLOW_EMAIL_REGISTER=true -CMD_EMAIL=false -CMD_OAUTH2_BASEURL=https://code.icb4dc0.de -CMD_OAUTH2_USER_PROFILE_URL=https://code.icb4dc0.de/login/oauth/userinfo -CMD_OAUTH2_AUTHORIZATION_URL=https://code.icb4dc0.de/login/oauth/authorize -CMD_OAUTH2_TOKEN_URL=https://code.icb4dc0.de/login/oauth/access_token -CMD_OAUTH2_PROVIDERNAME=Forgejo -CMD_OAUTH2_SCOPE=openid profile email -CMD_OAUTH2_USER_PROFILE_DISPLAY_NAME_ATTR=name -CMD_OAUTH2_USER_PROFILE_EMAIL_ATTR=email -CMD_OAUTH2_USER_PROFILE_USERNAME_ATTR=preferred_username -CMD_IMAGE_UPLOAD_TYPE=minio -CMD_S3_BUCKET=hedgedoc -CMD_S3_PUBLIC_FILES=false -CMD_MINIO_ENDPOINT=2df513adaee2eeae12106af900bed297.r2.cloudflarestorage.com -CMD_MINIO_PORT=443 -CMD_MINIO_SECURE=true \ No newline at end of file diff --git a/hedgedoc/config/hedgedoc.env b/hedgedoc/config/hedgedoc.env new file mode 100644 index 0000000000000000000000000000000000000000..357417697a24de79de4c67ea0cfb95781f83dcdb GIT binary patch literal 1850 zcmV-A2gUedXJsvAZewzJaCB*JZZ2Nb3ZbmmVK|*6;OHWuzFga3L zcyDfcMQl$?W_WCKZa8Q`L_}j~R4@uHEiE8LWKC*ka6wZ!HbqEDWNX6`SuM({ zN7u_L?i)Q)qq|hhbk*{?8@uhbw^a+#%nJzHR7s9dr?iI9Hu7U`>HKKeR)K)ZEuQ!H6 zb-YIAZ|P2)0d@upupKO`={5dzTS)BVJD%5uMvu$5D_2yIeZ4?MJ|zNLwh@Coxixfk zzeOjW2s-Dy&o40vKSg$XYsV%SsAJuWN%S02{%!9%U)4R^__Q|R7fsoHdL;xrX<|Tn zpEZdc8d z;;iY#AXDD3na{#-CtgP8R^(zK=Vde;I;(acDnd5;!p{01jOuI$d=!!BbC7mxk z+zTdSXQ$kAkA4-c8c5r4bMd0}$V{DW=WB9;YW9P^40M#r(r(CEpV4o;kT8bwd$vOg zh^t4cyOXLa{?zw4Hd&6G)UaH=LQTu-kI^RsTq4}I45IMLtft!XvzhGR-4-> zj$wdYylHL~B2T9jAL-~4wjfOXr$liv! zn}*$16mMzsY=H{FFjPIW07yLo5;5wl_pQn012RXp|KN7MVs5LQ54aT1TZbB3hlIct z4is%3kY8&xRK$n#BGi0I7339RyuAZbKX}eEz$zVA&U430tsi26(Jiuv|%_5yd oB%ZinXJ@Re-LqoAC_Tyo?$#Hr`BCm4ErtdRY4H!k4b{-80bq1{`~Uy| literal 0 HcmV?d00001 diff --git a/hedgedoc/kustomization.yaml b/hedgedoc/kustomization.yaml index c6c4ece..c8c904c 100644 --- a/hedgedoc/kustomization.yaml +++ b/hedgedoc/kustomization.yaml @@ -20,10 +20,7 @@ resources: - "resources/service.yaml" - "resources/http_routes.yaml" -generators: - - ./secret-generator.yaml - secretGenerator: - - name: hedgedoc-base-config + - name: hedgedoc-config envs: - - "config/base.env" + - "config/hedgedoc.env" diff --git a/hedgedoc/resources/config.enc.yaml b/hedgedoc/resources/config.enc.yaml deleted file mode 100644 index 8dac50e..0000000 --- a/hedgedoc/resources/config.enc.yaml +++ /dev/null @@ -1,40 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: hedgedoc-secret-config -type: Opaque -stringData: - CMD_MINIO_ACCESS_KEY: ENC[AES256_GCM,data:VqudURssSgmCDVhCRjak2TDG10pwvCNfi0w9FlEh4SI=,iv:VGavO528JfqsUVyvWSAlWkMTXJAmLUablaGZ3VCEtq8=,tag:unvEa2k/9AzfVMEnhCDB1Q==,type:str] - CMD_MINIO_SECRET_KEY: ENC[AES256_GCM,data:/iQq6wnoH/WwEzApap6szpr7z+KZJ+twcuINgqtbHOMDXeVz9Yi7cjC0hGlqQHZTCO4jR5gp+OwdIkzRk0zDsw==,iv:1OHm8K3AA340q0xkNCF3RsPpcpKmUE5Yibu+IWIZ7+E=,tag:cB/pckdoEZQlzlRVWoYKmA==,type:str] - CMD_OAUTH2_CLIENT_ID: ENC[AES256_GCM,data:x1zEeQl4WM49dmbx9v159APlimVVmQX4uPUTa0Nwu7jazcD1,iv:eXSk8Js2OhKC6q1M2anzCdC30IqA9YIj7rxmzFRE4bo=,tag:zgutG/3INA7DxUY5PRJoIg==,type:str] - CMD_OAUTH2_CLIENT_SECRET: ENC[AES256_GCM,data:biyLVbyONbJK2V16Zz9/MVdpdqu3iTzsyBVx0iKK5MCyNfU1Y0lV9g88w44junGvvby/LWOAEGs=,iv:uSRtuu+bHpt8JOVfw5BpCXjqWW07x0jJ8Ja2pIcoQf4=,tag:He4d6BrE1V9OJbNH3hrPcQ==,type:str] - CMD_SESSION_SECRET: ENC[AES256_GCM,data:Nq6arL1aE69BeTRjx4pA90xZqcOtqOb3R/Zt98FyIVd+Uq53dWsqURG2M+IQpvl9MEpY8FpUNY0=,iv:JaOAe8YgNVnDBzV2x1TSqMJq36Qwqazk6cCkWwseBZc=,tag:FMKKOhow/w5HLwfNarQdjQ==,type:str] -sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] - age: - - recipient: age18e0w4jn03n66qwg8h3rjstz7g5zx2vhvz28aterkfkfetrxtpuysftp6we - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA5cHVKUm5Nby9hSjdOM3JY - UWs0UWdrNC9FOVd1b1VjK1BmYVdwZng4T2tvCnBhYVdNbGFwWnBPMkJiSk1pbHlv - aGJTRjdsb1JrSHpIMk5JWEZNOTBoc0kKLS0tIEZscSs4SFVIVG5NanlUQU1IM1hv - M1F2WE1taWZ2bG0reU1EYWw2K1pZK2cKSHxed4HgSf0vKNGBMuFaS99znRPphkoF - TgjkD7nI/nyvflV0Bs1lqMlWZJsyY9+HaLp38j95mAcXc224SSBMxw== - -----END AGE ENCRYPTED FILE----- - - recipient: age1yssdnqk90tn6zzggmwt70krndw04yfk9hwzdac3wsgfxmttngd7q89qzjr - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBtd3k2MzQ2aGx0NmwzYU95 - QkVNVkJuQmdrOEUwM3FJNGFOZndxYWFTeVFZCmo3RnRQakxoelV6WmJHK3UyMnBZ - NTMvYkxqWHhYbjVBSkV5YjZlZTdndjQKLS0tICs5UlQwNHAvdW5oYXlqYTFFOEM5 - ZXpzNmEzbXhtZDkySFM2L0VQTzZCdTQKh46uRnVtRzzdnnnuCJNwgQo8AeNKpc6B - WC91My4qyOtvM9J+FJC71DTovfmHrZw0YWbPwXqNRU6XBWHfC/MViA== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-12-20T20:40:53Z" - mac: ENC[AES256_GCM,data:DcoiksdfIUl5cCC8mSbzAUO9lWTeotr/UNMwIa+Z7aq9s4tzVn3YBbAPh5by5U7PVqAPkutoBjUk1IXCqWykkGXw/k9n7mAZn5AiCweLNY/d0gmKTpCUsGqaTg8gH7gQJy6+TNGxnq+Wm4GQNHAduYMJXS4/UdJcIAAc/id4JXo=,iv:+OYzaUHdJN4daTrAg561LxS0i6lozZ+OylhxubZplYc=,tag:7gElSJeGIaqXzjYTe9OTZQ==,type:str] - pgp: [] - unencrypted_regex: ^(apiVersion|metadata|kind|type)$ - version: 3.8.1 diff --git a/hedgedoc/resources/deployment.yaml b/hedgedoc/resources/deployment.yaml index f1eed14..43bb21b 100644 --- a/hedgedoc/resources/deployment.yaml +++ b/hedgedoc/resources/deployment.yaml @@ -25,9 +25,7 @@ spec: value: /certs/ca.crt envFrom: - secretRef: - name: hedgedoc-base-config - - secretRef: - name: hedgedoc-secret-config + name: hedgedoc-config ports: - containerPort: 3000 protocol: TCP diff --git a/hedgedoc/secret-generator.yaml b/hedgedoc/secret-generator.yaml deleted file mode 100644 index 6dc7149..0000000 --- a/hedgedoc/secret-generator.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: viaduct.ai/v1 -kind: ksops -metadata: - # Specify a name - name: hedgedoc-config-secret-generator - annotations: - config.kubernetes.io/function: | - exec: - path: ksops -files: - - ./resources/config.enc.yaml \ No newline at end of file