Merge pull request 'disable-postgres-on-bekkalokk' (!85 ) from disable-postgres-on-bekkalokk into main

Reviewed-on: https://git.pvv.ntnu.no/Drift/pvv-nixos-config/pulls/85 Reviewed-by: Daniel Lovbrotte Olsen <danio@pvv.ntnu.no>
bekkalokk/roundcube: add postgres password
2025-04-04 21:21:22 +02:00 · 2024-10-13 02:34:45 +02:00 · 2024-10-12 23:57:27 +02:00 · 2024-10-12 23:49:10 +02:00 · 2024-10-12 22:53:42 +02:00 · 2024-10-12 22:42:59 +02:00
5 changed files with 50 additions and 6 deletions
--- a/base/services/openssh.nix
+++ b/base/services/openssh.nix
@ -10,5 +10,12 @@
      Match All
    '';
    settings.PermitRootLogin = "yes";
+
  };
+    users.users."root".openssh.authorizedKeys.keys = [
+      "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCqVt4LCe0YIttr9swFxjkjn37ZDY9JxwVC+2gvfSINDJorOCtqPjDOTD2fTS1Gz08QCwpnLWq2kyvRchu6WgriAbSACpbZZBgxRaF/FVh3oiMVFGnNKGnv6/fdo/vZtu8mUVuqtmTrgLYpZdbR4oD3XiBlDKs7Cv5hPqt95lnP6MNFvE8mICCfd1PwhsABd2IQ5laz3u77/RXhNFJL0Kf2/+6gk9awcLuwHrPdvq7c3BxRHbc9UMRQENyjyQPa7aLe+uJBFLKP51I8VBuDpDacuibQx7nMt6N2UJ2KWI0JxRMHuJNq4S5jidR82aOw9gzGbTv30SKNLMqsZ0xj4LtdqCXDiZF6Lr09PsJYsvnBUFWa14HGcThKDtgwQwBryNViYmfv//0h9+RLZiU0ab+NEwSs7Zh5iAD+vhx64QqNX3tR7Le4SWXh8W0eShU9N78qYdSkiC3Ui7htxeqOocXM/P4AwbnHsLELIvkHdvgchCPvl8ygZa4WJTEWv16+ICskJcAKWGuqjvXAFuwjJJmPp9xLW9O0DFfQhMELiGamQR9wK07yYQVr34iah6qZO7cwhSKyEPFrVPIaNtfDhsjED639F7vmktf26SWNJHWfW0wOHILjI6TgqUvy0JDd8W8w0CHlAfz6Fs2l99NNgNF8dB3vBASbxS0hu/y0PVu/xQ== openstack-sleipner"
+
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICCbgJ0Uwh9VSVhfId7l9i5/jk4CvAK5rbkiab8R+moF root@sleipner"
+    ];
 }
+
--- a/hosts/bekkalokk/services/gitea/default.nix
+++ b/hosts/bekkalokk/services/gitea/default.nix
@ -104,6 +104,30 @@ in {
        ENABLE_FEDERATED_AVATAR = false;
      };
      actions.ENABLED = true;
+      ui = {
+        REACTIONS = lib.concatStringsSep "," [
+          "+1"
+          "-1"
+          "laugh"
+          "confused"
+          "heart"
+          "hooray"
+          "rocket"
+          "eyes"
+          "100"
+          "anger"
+          "astonished"
+          "no_good"
+          "ok_hand"
+          "pensive"
+          "pizza"
+          "point_up"
+          "sob"
+          "skull"
+          "upside_down_face"
+          "shrug"
+        ];
+      };
      "ui.meta".DESCRIPTION = "Bokstavelig talt programvareverkstedet";
    };
  };
--- a/hosts/bekkalokk/services/webmail/roundcube.nix
+++ b/hosts/bekkalokk/services/webmail/roundcube.nix
@ -6,6 +6,11 @@ let
  domain = "webmail.pvv.ntnu.no";
 in
 {
+  sops.secrets."roundcube/postgres_password" = {
+    owner = "nginx";
+    group = "nginx";
+  };
+
  services.roundcube = {
    enable = true;

@ -20,6 +25,11 @@ in
    maxAttachmentSize = 20;
    hostName = "roundcubeplaceholder.example.com";

+    database = {
+      host = "postgres.pvv.ntnu.no";
+      passwordFile = config.sops.secrets."roundcube/postgres_password".path;
+    };
+
    extraConfig = ''
      $config['enable_installer'] = false;
      $config['default_host'] = "ssl://imap.pvv.ntnu.no";
--- a/secrets/bekkalokk/bekkalokk.yaml
+++ b/secrets/bekkalokk/bekkalokk.yaml
@ -18,6 +18,8 @@ mediawiki:
        postgres_password: ENC[AES256_GCM,data:FzykBVtJbA+Bey1GE5VqnSuv2GeobH1j,iv:wayQH3+y0FYFkr3JjmulI53SADk0Ikur/2mUS5kFrTk=,tag:d+nQ/se2bDA5aaQfBicnPQ==,type:str]
        cookie_salt: ENC[AES256_GCM,data:BioRPAvL4F9ORBJDFdqHot81RhVpAOf32v1ah3pvOLq8E88bxGyKFQZxAwpIL3UkWQIsWMnEerm5MEMYL1C2OQ==,iv:yMVqiPTQ8hO1IVAax6PIkD0V9YTOEunwDTtnGcmy6Kc=,tag:Z4+bZF4olLlkx7YpXeQiUw==,type:str]
        admin_password: ENC[AES256_GCM,data:4eUXvcO7NLOWke9XShfKzj+x3FvqPONa,iv:3iZ+BTBTZ7yMJ0HT14cEMebKZattWUcYEevRsl/6WOk=,tag:CU0iDhPP2ndztdX5U5A4cw==,type:str]
+roundcube:
+    postgres_password: ENC[AES256_GCM,data:fGHmq6r/ZCeIseHL8/gmm5DfWQYorI3OJq1TW0EHvh7rHL62M4TE+Lrlrmq8AIlmGLSWtO8AQzOP3toxidL6xWX3pcwLxtTefa1gom2oQf6ZL4TbAZLidHksdiro6pWtpMOO66bb8O9eXvZmns4=,iv:Irnb2/bgx8WilDyRLleWfo6HHafZ+vlDEwxIcgm1f18=,tag:eTNBUELmLwO7DsQN9CLX7Q==,type:str]
 idp:
    cookie_salt: ENC[AES256_GCM,data:cyV6HDCPHKQIa8T1+rFBFh6EuHtG5B508lg6uFYENK7qVpYuiTUIokdVQhY8SRLs2mECx/ampgnUHxCRB/Cc/A==,iv:QRrRUhzRQrLkmg38rrYtCEfF8U4/7ZHZUDSEq++BlbI=,tag:fLqFSLd+CKqJvmCh1fx8vg==,type:str]
    admin_password: ENC[AES256_GCM,data:Vf33Oenk6x6BIij1uW8RQDjTPcKhUVYA,iv:RNeyCNpTAYdBPrZwE3Y6CCjoAML/3XUvjfJCrr06IEU=,tag:zVOrx1oXnEyr/VwFCFaCDQ==,type:str]
@ -95,8 +97,8 @@ sops:
            UHpLRkdQTnhkeGlWVG9VS1hkWktyckEKAdwnA9URLYZ50lMtXrU9Q09d0L3Zfsyr
            4UsvjjdnFtsXwEZ9ZzOQrpiN0Oz24s3csw5KckDni6kslaloJZsLGg==
            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-09-01T01:33:50Z"
-    mac: ENC[AES256_GCM,data:PkcOD9hJWD5tILO9PuZkOgIoujt4q2qtHBB9KF8ikrNKo0yw24Jf1ceI5/+BHCxhdi8sF4qQM/zty61zqwNaBsvrsLUkdWDwUDsuJQa1KKZiCEZPqYBc+qGIQ5wNPsU2zJ0c8+wU8H0LtGqKOH9GmaQtTdm0Rt2IcexV823uTjQ=,iv:GYTI85OgqnN8iUc6OOXO7Sz2XIthWJtz8zwMuWutEYs=,tag:2rhfhjXXzZLzoVlkINo0ZQ==,type:str]
+    lastmodified: "2024-10-12T21:56:27Z"
+    mac: ENC[AES256_GCM,data:bZ1BbVC6D+B6SFze2ReeCUcQamK/O14zH3YxCjWBwMC++w3niIiEx4Bq7Ulci5yuMld0luVsfUzHoqFN/+zvZbV2rGVk8lVRiTrpFoSZ78aUUgeHG9ROLXsR7T7rVhLWbl86y1G5LcKws7G55V0wAh6f58WjYYzwR8fnBmfW1Ko=,iv:7xtMdtXQB9uZirE/CkUSmeu0qnG++R7DUR7zn/Bo0lM=,tag:DH/BJPpAp//quDqKNXyHcg==,type:str]
    pgp:
        - created_at: "2024-08-04T00:03:28Z"
          enc: |-
@ -119,4 +121,4 @@ sops:
            -----END PGP MESSAGE-----
          fp: F7D37890228A907440E1FD4846B9228E814A2AAC
    unencrypted_suffix: _unencrypted
-    version: 3.9.0
+    version: 3.9.1
--- a/secrets/bicep/matrix.yaml
+++ b/secrets/bicep/matrix.yaml
@ -8,6 +8,7 @@ mjolnir:
    access_token: ENC[AES256_GCM,data:ERFqZjK7MRD0xWt91FNCIxP1YC6Qj54QgnckHlCTtcQVLWaM1h2h9lHS+K8=,iv:1d7vmFkXAPcsmumzlmOT31amdrKLWtL5sJiS8G9g+LE=,tag:2l0vWzJ6P12ofuBdf5CCWw==,type:str]
 registrations:
    mx-puppet-discord: ENC[AES256_GCM,data:FleyXxgOmc05nTP6M2DBJlacufN3p/05eZm4kB8+K4ci0k24o3zli988wlM/kyeZmxu4pgQlJ3lNLte4uip2hBXHWG5t5Ldzmr7bNCUD+r7nM+I1lfNkrDROPZ54bHysmn9O5CHpEa16rSo6RJgncIPqsLJxTwjC7qZlkOpzqvMhkq/MHCVOpvg0M/6AUR+AlSZoggujBMoXLznQNQapN13foEsbuo/QxjszM/ObGmhYMVyaS+TDBXzQLA8Yuj50Q/gZCIINWZ4G2qmgsGxxNR4I+usUQml/jxCtIXS4zn/ettXfL9G4Fdm2F9u1v11DehtTGa5xoxDq94M9rIxOqeJpvgEQEyyKAyFUIrlINfGl7tAj4Zu7+9Z8JTRAnppjM1q8iInwn/Z2L9KgB0YFi/Go1whgXly+TH6hpreo7m5klXV/ff/aV3ghOgFCGA8nBrZFqE8Uw268q9tV1s1dxCb6TbpGf19V5c9MD6BsCIVeoq+j9I/I8iZpzg2Reb4IlHhMDwbwsL2w2ks30wiZ9XO/CFrXDY4uBlI=,iv:3vvkGvldS8Raibg6tzlV8VY1O9NCLxSuNX/lwi1QgiA=,tag:D/noIsE3xlOiYM6Pk+cc8Q==,type:str]
+    matrix-hookshot: ENC[AES256_GCM,data:xdgW720VcaREJEaVs0BTT9/5fBp+VpXL54oRrLt53ymjMMS5QCLA9VLW0kOwadpZcr9xv2txVICkU63wmmH5W6HzDHpVbVWG5ByUMyvZkBWWB5HEvfNi6+66CGRNwPqrtrmM4aS8cg3eoXje+qJbjfxk0UzQsDkPV/VXxpzcQt47GTMUX59Xu9C6SYncze5G3QkTn30o+jiJMiha4xTULfqnP0iHXDVN1iFlNudOgr8keQIdYnFu7QqWZdvuERUPA9OANy8c0CQxoMxuUfHnLvxPyEYkDXTyBIgBAWC2AlOqHJWXUccqXYZWSRFp51uB3Tmlhkv+nTsmVWndnmOgnVpvUp9BS1wTqF8z3Vg63EHCrOGb4iPprjH13hUompmXDsFt4+FC1vd1KIl5DeAL9N3WCDa0hX4reH0SVmI2alNG28cpKdFimMowgdHJ9nLA7rgIqGRjciZMr+uJTGnWHeOFpqUo3hkF9vA2+Ca0Ti307SfgCsymfVgt9nFIoHGwWG2CJ0FdAs7JUiKIuG4K87HpYaowcAcCj9wU2sVKvDx+zQWb7pmRM2TGDJZ2W/yzYdFWLCqbSUBt0S/1rEPiqj5h7+y2ZTWB42aN0lcjWOwZBP39+wvJI+4EUE/F+aezPd6viWyJn8pIK9ZBDEcWfBBEb/xADa8UTBk6LjL/Sqsu9BDvCbIaOeTDi/LaUNJLOdre9GiUtjWlAxXKjYhYaFpI0SlXP42JZxLhz5jvGE8kGgPK+ruq2bai3KiwaWJRSadnO5L1+bFTjaiVrp2PSskULdHmCxgKDfPDmMWglPvF7wCswMmE4rqvBx0fxVtPTVzQeo6pwUBbZ4Ihg6UlcFEBncyNCahuvClCNO2st7c7ygbnMoZuDDYjgqbCf2jVOPg06FDgn5wXi2jJerw4L7NAD8FtsepScuqdjmsB14oepMDMgOnzKc72h4JiIouUe3wkU1ReTdIIxfpuvLpF9WNzwZOc214YfDWdhus+RvsHZtoaupezjHFDiFmwP5tygyz3iw==,iv:HIVrDHhwEQ+NOU4MYUXgz1aSjQD445b/LSj4rqvJRY8=,tag:VJAy4v9OZJrOV2y4JFuh9w==,type:str]
 sops:
    kms: []
    gcp_kms: []
@ -68,8 +69,8 @@ sops:
            WEh5NFN6SFF1TlltdWFWTGw4MHRHUkUKrKIvC87xjEmwxPQhH8dN+ZuaJTCgPY28
            pR62KxmoKFICLTHPpYP3euiAx5M9BWvgvCnA/US/5klpk8MtlreNFA==
            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-09-27T04:34:10Z"
-    mac: ENC[AES256_GCM,data:FACb/Ow4s6dqjghAphCa1ZwIwX7+CRhIudQ9UlDtxB+4Bdpa/T0l73oaMa5lmmyCEyuVM3HXOFcm4I/urLtvaN+QQoqRYnUHKkdNYFhayGpeckZUNu7JWsFsQWk0kfKZEDqHIBoee7xBVzrVtRJeKVWv+JPlch4NVOakm3MitZA=,iv:rvve5MRDpDD/FblN8KaQ2PvxsYZSQPSw5oDfyko/Nvs=,tag:vuB0jYmO6AiNtZuSJ3ipBQ==,type:str]
+    lastmodified: "2024-10-12T21:48:59Z"
+    mac: ENC[AES256_GCM,data:fLpGjWpoLwwwofwBzkNakD9JoNjbbGOvTEKrrT1jTWXo26Y01NkuqTEEwbmNkODOjmlyeTovRnY3K0dujtEcKJO8Nlu3uNCiL/ie3KitYTQH1lrsI7IdtXvCRELU5trQCqFmBjYUFhFyldKyKL30QxEuYxxTa+t1eBmtOL4jBTY=,iv:kcAPBuA3R5uF6bTfffMgdnsySKxSmCheQx1tOpRwyf4=,tag:aUGRR5w8Ljcdh458ir99DA==,type:str]
    pgp:
        - created_at: "2024-08-04T00:03:46Z"
          enc: |-
Author	SHA1	Message	Date
Oystein Kristoffer Tveit	f5c16f46f1	Merge pull request 'disable-postgres-on-bekkalokk' (!85 ) from disable-postgres-on-bekkalokk into main Reviewed-on: https://git.pvv.ntnu.no/Drift/pvv-nixos-config/pulls/85 Reviewed-by: Daniel Lovbrotte Olsen <danio@pvv.ntnu.no>	2024-10-13 02:34:45 +02:00
h7x4	aa71d497f1	bekkalokk/roundcube: add postgres password	2024-10-12 23:57:27 +02:00
Daniel Olsen	c56d157c3f	add registration secret	2024-10-12 23:49:10 +02:00
fredrikr79	4fbd823be6	bekkalokk/roundcube: add `database.host`	2024-10-12 22:53:42 +02:00
Daniel Olsen	6c9e651e59	bekkalokk/gitea: Add important emoji reactions	2024-10-12 22:42:59 +02:00
Adrian G L	f56e73548c	base: openssh fix	2024-10-12 22:32:18 +02:00
Adrian Gunnar Lauterer	c62ea129ed	Merge pull request 'base openssh added sleipner ssh keys' (!83 ) from sleipner-authorised-keys into main Reviewed-on: https://git.pvv.ntnu.no/Drift/pvv-nixos-config/pulls/83	2024-10-12 21:48:08 +02:00
Adrian G L	4b41ddcf5d	base: openssh added sleipner ssh keys	2024-10-12 21:47:31 +02:00