node002.yml

@@ -45,8 +45,6 @@
       tags: [ntfy, notifications, push]
     - role: reitanlage_oranienburg
       tags: [reitanlage-oranienburg, website]
-    - role: shlink
-      tags: [shlink, url-shortener]
     - role: synapse
       tags: [synapse, matrix, communication]
     - role: tandoor

roles/faas/vars/main.yml

@@ -7,10 +7,8 @@ faas_svc:
   extra_svcs:
     - domain: link.serguzim.me
       faas_function: url-mapper
-    - domain: serguzim.me
+    - domain: msrg.cc
-      faas_function: webpage-serguzim-me
+      faas_function: webpage-msrg-cc
-      www_domain: true
-      hsts: true
       caddy_extra: |
         header /.well-known/* Access-Control-Allow-Origin *
 
@@ -22,6 +20,10 @@ faas_svc:
             rewrite * /.well-known/webfinger/{user}.json
             import faas webpage-msrg-cc
         }
+    - domain: serguzim.me
+      faas_function: webpage-serguzim-me
+      www_domain: true
+      hsts: true
     - domain: team-leon.eu
       faas_function: webpage-team-leon-eu
       www_domain: true

roles/shlink/tasks/main.yml

@@ -1,12 +0,0 @@
----
-- name: Set common facts
-  ansible.builtin.import_tasks: tasks/set-default-facts.yml
-
-- name: Deploy {{ svc.name }}
-  vars:
-    svc: "{{ shlink_svc }}"
-    env: "{{ shlink_env }}"
-    compose: "{{ shlink_compose }}"
-  block:
-    - name: Import tasks to deploy common service
-      ansible.builtin.import_tasks: tasks/deploy-common-service.yml

roles/shlink/vars/main.yml

@@ -1,30 +0,0 @@
----
-shlink_svc:
-  domain: msrg.cc
-  name: shlink
-  port: 8080
-
-shlink_env:
-  DEFAULT_DOMAIN: "{{ shlink_svc.domain }}"
-  IS_HTTPS_ENABLED: true
-  TIMEZONE: "{{ timezone }}"
-
-  DEFAULT_SHORT_CODES_LENGTH: 8
-  MULTI_SEGMENT_SLUGS_ENABLED: false
-  SHORT_URL_TRAILING_SLASH: true
-  REDIRECT_APPEND_EXTRA_PATH: true
-  DEFAULT_BASE_URL_REDIRECT: "https://www.serguzim.me/"
-
-  DB_DRIVER: postgres
-  DB_HOST: "{{ postgres.host }}"
-  DB_PORT: "{{ postgres.port }}"
-  DB_NAME: shlink
-  DB_USER: "{{ vault_shlink.db.user }}"
-  DB_PASSWORD: "{{ vault_shlink.db.pass }}"
-
-  DISABLE_TRACKING: true
-  SKIP_INITIAL_GEOLITE_DOWNLOAD: true
-
-shlink_compose:
-  watchtower: true
-  image: shlinkio/shlink

roles/telegraf/vars/main.yml

@@ -9,7 +9,7 @@ telegraf_svc:
   prometheus_unprotected:
     urls:
       - http://node002.vpn.serguzim.net:2019/metrics
-      - https://matrix.serguzim.me/_synapse/metrics
+      - https://matrix.msrg.cc/_synapse/metrics
       - https://push.serguzim.me/metrics
       - https://tick.serguzim.me/metrics
       - https://todo.serguzim.me/api/v1/metrics