diff --git a/apps/faf-user-service/mail/account-deletion-confirmation.html b/apps/faf-user-service/mail/account-deletion-confirmation.html new file mode 100644 index 00000000..a514466c --- /dev/null +++ b/apps/faf-user-service/mail/account-deletion-confirmation.html @@ -0,0 +1,491 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Confirm your FAF account deletion
+ +
+ + + + +
+
+ + + + + + +
+ + +
+ + + + + + + + + + + + + + + + + + + + + +
+ +
 
+ +
+ + + + + + + +
+ + FAF Logo + +
+ +
+ +
Forged Alliance Forever
+ +
+ +
 
+ +
+ +
+ + +
+
+
+ + + + +
+ + + + + + + +
+ + +
+ + + + + + + + + + + + + + + + + +
+ +

Confirm your account deletion

+ +

Dear {{`{{username}}`}},

+ +

+ We received a request to permanently delete your FAForever account. + Click the button below to confirm this request. +

+ +

+ Once confirmed, your account will be deleted or anonymized in accordance + with our account deletion process. This action cannot be undone. +

+ +
+ + + + + + + +
+ + Confirm account deletion + +
+ +
+ +

Thanks,

+

-- The FAForever team

+ +
+ +
+ + +
+ +
+ + + + + +
+ + + + + + + +
+ + +
+ + + + + + + + + +
+ +

+ If you did not request this deletion, you can safely ignore this email. + Your account will remain unchanged unless you confirm the request. +

+ +
+ +
+ + +
+ +
+ + + + + +
+ + + + + + + +
+ + +
+ + + + + + + + + +
+ +
+

+ www.{{.Values.baseDomain}} +

+ +
+ +
+ + +
+ +
+ + + + + +
+ + + + + + + +
+ + +
+ + + + + + + + + +
+ +

+ If the button above does not work, open this URL manually in your browser: + {{`{{confirmationUrl}}`}} +

+ +
+ +
+ + +
+ +
+ + + + + +
+ + + + \ No newline at end of file diff --git a/apps/faf-user-service/mail/account-deletion-notification.html b/apps/faf-user-service/mail/account-deletion-notification.html new file mode 100644 index 00000000..d2a86a13 --- /dev/null +++ b/apps/faf-user-service/mail/account-deletion-notification.html @@ -0,0 +1,400 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Your FAF account has been deleted
+ +
+ + + + +
+
+ + + + + + +
+ + +
+ + + + + + + + + + + + + + + + + + + + + +
+ +
 
+ +
+ + + + + + + +
+ + FAF Logo + +
+ +
+ +
Forged Alliance Forever
+ +
+ +
 
+ +
+ +
+ + +
+
+
+ + + + +
+ + + + + + + +
+ + +
+ + + + + + + + + +
+ +

Your account has been deleted

+ +

Dear {{`{{username}}`}},

+ +

+ Your FAForever account deletion request has now been completed. +

+ +

+ Your personal account data has been deleted or anonymized in accordance + with our account deletion process. +

+ +

Thanks,

+

-- The FAForever team

+ +
+ +
+ + +
+ +
+ + + + + +
+ + + + + + + +
+ + +
+ + + + + + + + + +
+ +

+ If you did not request this account deletion, please contact the FAForever team immediately. +

+ +
+ +
+ + +
+ +
+ + + + + +
+ + + + + + + +
+ + +
+ + + + + + + + + +
+ +
+

+ www.{{.Values.baseDomain}} +

+ +
+ +
+ + +
+ +
+ + + + + +
+ + + + \ No newline at end of file diff --git a/apps/faf-user-service/templates/config-files.yaml b/apps/faf-user-service/templates/config-files.yaml index 1bf82ef3..e4bc1cb4 100644 --- a/apps/faf-user-service/templates/config-files.yaml +++ b/apps/faf-user-service/templates/config-files.yaml @@ -7,6 +7,10 @@ metadata: data: "account-activation.html": |- {{ tpl (.Files.Get "mail/account-activation.html") . | indent 4 }} + "account-deletion-confirmation.html": |- +{{ tpl (.Files.Get "mail/account-deletion-confirmation.html") . | indent 4 }} + "account-deletion-notification.html": |- +{{ tpl (.Files.Get "mail/account-deletion-notification.html") . | indent 4 }} "password-reset.html": |- {{ tpl (.Files.Get "mail/password-reset.html") . | indent 4 }} "welcome-to-faf.html": |- diff --git a/apps/faf-user-service/templates/config.yaml b/apps/faf-user-service/templates/config.yaml index 914f43da..86d6b3ed 100644 --- a/apps/faf-user-service/templates/config.yaml +++ b/apps/faf-user-service/templates/config.yaml @@ -25,4 +25,10 @@ data: LOBBY_URL: "wss://ws.{{.Values.baseDomain}}" IRC_TOKEN_TTL: "86400" REPLAY_URL: "wss://replay-ws.{{.Values.baseDomain}}" - ALTCHA_ENABLED: "true" \ No newline at end of file + ALTCHA_ENABLED: "true" + RABBITMQ_USER: "faf-user-service" + RABBITMQ_PORT: "5672" + RABBITMQ_HOST: "rabbitmq" + NODEBB_READ_API_URL: https://forum.{{.Values.baseDomain}}/api + NODEBB_WRITE_API_URL: https://forum.{{.Values.baseDomain}}/api/v3 + WIKIJS_GRAPHQL_URL: https://wiki.{{.Values.baseDomain}}/graphql diff --git a/apps/faf-user-service/templates/local-secret.yaml b/apps/faf-user-service/templates/local-secret.yaml index f31836fd..bf615074 100644 --- a/apps/faf-user-service/templates/local-secret.yaml +++ b/apps/faf-user-service/templates/local-secret.yaml @@ -12,4 +12,5 @@ stringData: LOBBY_SECRET: "banana" REPLAY_SECRET: "banana" ALTCHA_HMAC_KEY: "bananabananabananabanana" + RABBITMQ_PASSWORD: "banana" {{- end}} diff --git a/apps/rabbitmq/templates/config.yaml b/apps/rabbitmq/templates/config.yaml index dec705fc..af3e16d9 100644 --- a/apps/rabbitmq/templates/config.yaml +++ b/apps/rabbitmq/templates/config.yaml @@ -6,7 +6,7 @@ metadata: app: rabbitmq data: ADMIN_USER: "faf-admin" - "enabled_plugins": "[rabbitmq_management,rabbitmq_prometheus]." + "enabled_plugins": "[rabbitmq_management,rabbitmq_prometheus,rabbitmq_shovel,rabbitmq_shovel_management]." "rabbitmq_conf": |- default_user = $(ADMIN_USER) default_pass = $(ADMIN_PASSWORD) diff --git a/apps/rabbitmq/templates/statefulset.yaml b/apps/rabbitmq/templates/statefulset.yaml index 802ec2e3..a03b4ff2 100644 --- a/apps/rabbitmq/templates/statefulset.yaml +++ b/apps/rabbitmq/templates/statefulset.yaml @@ -17,7 +17,7 @@ spec: app: rabbitmq spec: containers: - - image: rabbitmq:3.13.7-management-alpine + - image: rabbitmq:4.3.6-management-alpine imagePullPolicy: Always name: rabbitmq ports: diff --git a/apps/rabbitmq/values.yaml b/apps/rabbitmq/values.yaml index 82b9d710..9d3e176f 100644 --- a/apps/rabbitmq/values.yaml +++ b/apps/rabbitmq/values.yaml @@ -1,6 +1,6 @@ image: repository: rabbitmq - tag: 3.13.7-management-alpine + tag: 4.3.6-management-alpine infisical-secret: name: rabbitmq @@ -26,3 +26,7 @@ users: secretRef: faf-icebreaker usernameKey: RABBITMQ_USER passwordKey: RABBITMQ_PASSWORD + - configMapRef: faf-user-service + secretRef: faf-user-service + usernameKey: RABBITMQ_USER + passwordKey: RABBITMQ_PASSWORD