vueko/mail: Add alias

okarin: Change domain
secrets: Update media-htpasswd
2023-12-31 11:37:41 +01:00 · 2023-12-28 23:27:34 +01:00 · 2023-12-28 17:16:16 +01:00 · 2023-12-25 23:39:54 +01:00 · 2023-12-24 13:06:57 +01:00
7 changed files with 18 additions and 14 deletions
--- a/machines/default.nix
+++ b/machines/default.nix
@ -51,7 +51,7 @@ in
  okarin = {
    system = "x86_64-linux";

-    targetHost = "okarin.sbruder.xyz";
+    targetHost = "okarin.sbruder.de";
  };
  shinobu = {
    system = "x86_64-linux";
--- a/machines/okarin/configuration.nix
+++ b/machines/okarin/configuration.nix
@ -22,7 +22,7 @@
  services.nginx = {
    enable = true;

-    virtualHosts."okarin.sbruder.xyz" = {
+    virtualHosts."okarin.sbruder.de" = {
      enableACME = true;
      forceSSL = true;

--- a/machines/okarin/hardware-configuration.nix
+++ b/machines/okarin/hardware-configuration.nix
@ -56,7 +56,7 @@
      eth0 = {
        name = "eth0";
        DHCP = "yes";
-        domains = [ "sbruder.xyz" ];
+        domains = [ "sbruder.de" ];
        address = [ "2001:8d8:1800:8627::1/64" ];
        gateway = [ "fe80::1" ];
        networkConfig = {
--- a/machines/renge/services/element-web.nix
+++ b/machines/renge/services/element-web.nix
@ -31,23 +31,22 @@ in
          server_name = "matrix.sbruder.de";
        };
      };
-      showLabsSettings = true;
+      show_labs_settings = true;
      branding = {
-        authFooterLinks = [ ];
+        auth_footer_links = [ ];
      };
      piwik = false;
-      defaultCountryCode = "DE";
-      settingDefaults = {
+      default_country_code = "DE";
+      setting_defaults = {
        "UIFeature.feedback" = false;
        "UIFeature.shareSocial" = false;
        "UIFeature.identityServer" = false;
        "UIFeature.thirdPartyId" = false;
      };
      disable_custom_urls = true;
-      jitsi.preferredDomain = "meet.jalr.de";
      disable_guests = true;
      disable_3pid_login = true;
-      desktopBuilds.available = false;
+      desktop_builds.available = false;
    });
  };
 }
--- a/machines/renge/services/prometheus.nix
+++ b/machines/renge/services/prometheus.nix
@ -71,6 +71,11 @@ in
          "shinobu.vpn.sbruder.de:9100"
          "nazuna.vpn.sbruder.de:9100"
        ];
+        relabel_configs = lib.singleton {
+          target_label = "instance";
+          source_labels = lib.singleton "__address__";
+          regex = "(.*)\\.vpn\\.sbruder\\.de:9100";
+        };
      }
      {
        job_name = "qbittorrent";
@ -176,7 +181,7 @@ in
            rules = map mkAlert [
              {
                name = "InstanceDown";
-                expr = ''up{instance!~"(nunotaba|hitagi|mayushii|fuuko).vpn.sbruder.de:.*"} == 0'';
+                expr = ''up{instance!~"(nunotaba|hitagi|mayushii|fuuko)"} == 0'';
                description = "Instance {{ $labels.instance }} of job {{ $labels.job }} has been down for more than 1 minutes.";
              }
              {
--- a/machines/vueko/secrets/mail-users.nix
+++ b/machines/vueko/secrets/mail-users.nix
--- a/secrets.yaml
+++ b/secrets.yaml
@ -1,5 +1,5 @@
 listenbrainz-token: ENC[AES256_GCM,data:0lHG/52VGRnO+ubG2dZqILIgZ4ddSmZKN2AOhL3ezP0MbQw1,iv:fFvFOVy1oF1Ppv0PwyNDem6h5OqZLF/9DDrODHjg7g0=,tag:LwplKbzhz5rfCuY91WXk9w==,type:str]
-media-htpasswd: ENC[AES256_GCM,data:8o+MBYaH+OoPrK2FtDzxCLXCz8oGDezIALl2KkoVlj/ZtC4WfTHu6NnaUbi+xUb7s8bLHchpmFyXC9U5+yGAlHV/v7zKOrkrga08Qn2sHqudZS8uRMj4Mh/WdYbAJ+MjfhihTf377obIDJAesYwL8Jnkcy5NiVSD7jN7PJUlTLFLiXr+U+dYctJG1b2TnhNaGL9FnutG6GnOHP37AZaTMPaD0YgSNJ+PNEGULkajwxNj2dn9XFeQGa5DlETHh8UlL3+6hUBUgXsAiN3UkRYJGLybq2vDlS9uRXRzobCiqK1E58SXS0ZMOUzewtvvOixXDC31/ppd1WmUOweJ4JiAKGWindgj5yejxf8kk2UaIJQTjATb1jtQTmdMBEfckIq+xvbyVNAofBSlSAuo/FGNYt7zf2uH1Y6A3cQwgTSaMo8Rs01AfszyaXLMqwiS+k9kq/QXkH4VLAbVakli4yuywB4pusqBvf5vAFDdgTtKhag4vuworbo/kM8KXh6nAA==,iv:n44K6SEtrL6MYEzXdPHbOvzoIQBqnVee+uC0/kbgd1M=,tag:HeOX3bXb107fSFXUk6Hc5Q==,type:str]
+media-htpasswd: ENC[AES256_GCM,data:Ao4cTmUy8Ib08BvR05oEgh5FG7/DnjJr+h/1ywup0c0J1EWwwTAsBrjx5sj2II7aOJp0+Q1isEpWODKr+P0KHiegDIMLQNrkf22GXd8P8j3/+U957e/AOZTro4lPSzl+TlVyPCT0EavW3mYrNKmf9G++Gu+JjiWdejN+Uv7JVVXU/h2XMPO97xBAWZULyhPj1AOe6rkWO8DOnxS/+ETc0WWB//0fdpCn49WOF72WknmnBw4cE79H/p1qvrN71ADBJJzBB83hploC7q9wsv8HYGlenAiqg0+SA7AsCcw9Jndd6b1wvvJUegmPvdRLa8qTnzFN+GKD+4Yk/2RYuhDaiBwW2enDFRFOTr0HDIoUw6c30KxacX0anQg3CYnerGvxfLZl7Ox0WI0wHE3Ctv96qkkacPPFkLL/mH4q7E+m/Sg3Ep5ahPkhxQei4ZMQTA3Q8yL//RACN+HtECWYriGjMWvZguNOBfidkBgRsBQXwnCWwJy8muID4JxorIL00A==,iv:FPrq1m9CDxzdtAfOWhLclxZRiV7C5Oe4zie2WHbM49A=,tag:0m22s9zLNM4r0KQ4WoAEzw==,type:str]
 media-proxy-auth: ENC[AES256_GCM,data:OcmYZq/tyzMB61NfyYZ8gAlEE+8w2IhlPlZ+dfedtfqVlPHk3iJsd9mvsXHf5ODTtuy00ll0MF4KYNePZkz7TeuaIdBgGlshFyE4gwsJdPXZNYnhcg==,iv:qo6SOaHrWsXfvRwgSKDTSnreOcO9xy3RKrfE2k+VLEg=,tag:14DT86PQdEuK9zyZzcAohA==,type:str]
 media-ssh-key: ENC[AES256_GCM,data:cT5Jp5asgF2GZL4nn0rS4+tmli5adZjDa/G6WD/QXbOLtAjquytX63LKrLYUoTjOa7rNAjxDBIYEi90uvubKxOI0QbXACj0MSt6WbkxmosYResnFl9/WefpROctpGcDvn60fzer0K75IRBAtpAogVU7VynOkOuPa0xhTyAU8ZPOmij456UjpbtIgSg4yKVDn14jj/OZ1Oz+qd3bHC8FSQvp0jSKD9xfIizc2kb6ca3LRdR7VtJtTnJOOADRKaLC+rBywVyTOlCQBLiZ6LE9i6SmgFOdI+l6z9jE1Vi3vZ3BAe8Q/wWQ6Kjts+3+RkjPbgdjdWzxyHly/dr8lU1HcwtMHgKBV84asJBghCm6B1o48AEqd4oF9W039rCRQkR/VMb/ser0ifEjwnpDnDskrFYxWzidMKsfHGOtZxm7rzvOxSRA+Rcx9vxwa90gRsU4mBdx7QG0y3f/AbxRvVCuLLZW/y0JpCtE2B/mcObRvjsZP3RXQIS4vGAeTerd18RwsrsWO,iv:+ASa0hhWXmQ2hgJ9UuRFjnf/fA65kxWXiC+rDI6Lnx8=,tag:LDYSsN0DXAFiW0w+YBcopA==,type:str]
 torrent-proxy-auth: ENC[AES256_GCM,data:4oi4uZCgslTvmso1SCedu3gKsOTCtYIAf3g1mBS6/ta3d/hd6GJ0Ns+/9w51WrhcyJQRLSR7jLlzxRzKFp6JvKXlNAeflXDqOKNfk0LXY1GKTZynOA==,iv:26d+hQ9yn5CzDGNZvi9A5bvzgo87IrJHz67xTac4UA4=,tag:e8fO5Xpu7wpDiSC4CBsaaQ==,type:str]
@ -11,8 +11,8 @@ sops:
    azure_kv: []
    hc_vault: []
    age: []
-    lastmodified: "2023-09-18T13:17:11Z"
-    mac: ENC[AES256_GCM,data:y6VTyAeZgGyqafjw7asaeEq2XhhhB8QW8qhnaqUNUCO+OsgITXMOGwQmsWKN7qnW8D8r5WHiR0aojGROBhSKJ1tgPjRu+Ya5rMsOIN5KecqBhA1Z7yOL45xcYKVNJmiL0p9fxrrBQi1FP1zE1Rgwx+nD6MfydLoEU9LDBRFcyUs=,iv:Q3jbtDU+zWZXGhtCu3qC7KCXOM7gRBePHN0CxqBpvAM=,tag:8iRP6j78H90aDujiQh33fw==,type:str]
+    lastmodified: "2023-12-28T16:12:09Z"
+    mac: ENC[AES256_GCM,data:f7gcMjAEMU6uOeS7x2zvtyu+7DvPOCbtBy+zStALFou6B2rMBuqzJC1CynFh1f+NAKGtv1P3sMdag5Es5xsRHjFqQ0FfWceAB2anTsqW3ZLu+ZKS02p03lR5Tz59GQgS1MHcNkEovY2qZ/Mk/BODJzKYjqmb7ItjXTcSAGII5vg=,iv:gZE0w3Ih5x8xJ0x7sU+ZWo289PIaBUn/y8y78QDqidQ=,tag:cxlGk81xQGifm3IyE5ypwg==,type:str]
    pgp:
        - created_at: "2023-05-06T07:18:02Z"
          enc: |-
@ -173,4 +173,4 @@ sops:
            -----END PGP MESSAGE-----
          fp: FD4E1FB15DD0F36A77790229826C04C0BE319FA2
    unencrypted_suffix: _unencrypted
-    version: 3.7.3
+    version: 3.8.1
Author	SHA1	Message	Date
Simon Bruder	c5f5f6a5ca	vueko/mail: Add alias	2023-12-31 11:37:41 +01:00
Simon Bruder	2b91c531e8	okarin: Change domain	2023-12-28 23:27:34 +01:00
Simon Bruder	fc53106e1e	secrets: Update media-htpasswd	2023-12-28 17:16:16 +01:00
Simon Bruder	92bbeffca9	renge/prometheus: Shorten instance name for nodes	2023-12-25 23:39:54 +01:00
Simon Bruder	0c108d9e44	renge/element-web: Use snake_case for config camelCase is deprecated[0]. This also removes an unused jitsi server preference. [0] https://github.com/element-hq/element-web/blob/develop/docs/config.md#-deprecation-notice	2023-12-24 13:06:57 +01:00