Refactor websites

1 files changed, 9 insertions, 8 deletions

diff --git a/modules/private/websites/syden/peertube.nix b/modules/private/websites/syden/peertube.nix
index 2ad7217..e659875 100644
--- a/modules/private/websites/syden/peertube.nix
+++ b/modules/private/websites/syden/peertube.nix
@@ -23,7 +23,7 @@ in
     users.groups.peertube.gid = config.ids.gids.peertube;
 
     secrets.keys = [{
-      dest = "webapps/syden-peertube";
+      dest = "websites/syden/peertube";
       user = "peertube";
       group = "peertube";
       permissions = "0640";
@@ -69,7 +69,7 @@ in
 
     services.filesWatcher.syden_peertube = {
       restart = true;
-      paths = [ "/var/secrets/webapps/syden-peertube" ];
+      paths = [ config.secrets.fullPaths."websites/syden/peertube" ];
     };
 
     systemd.services.syden_peertube = {
@@ -86,7 +86,7 @@ in
 
       script = ''
         install -m 0750 -d ${dataDir}/config
-        ln -sf /var/secrets/webapps/syden-peertube ${dataDir}/config/production.yaml
+        ln -sf ${config.secrets.fullPaths."websites/syden/peertube"} ${dataDir}/config/production.yaml
         ln -sf ${package}/config/default.yaml ${dataDir}/config/default.yaml
         exec npm run start
       '';
@@ -109,11 +109,12 @@ in
     };
 
     services.websites.env.production.vhostConfs.syden_peertube = {
-      certName    = "eldiron";
-      addToCerts  = true;
-      hosts       = [ "syden.immae.eu" ];
-      root        = null;
-      extraConfig = [ ''
+      certName     = "syden";
+      addToCerts   = true;
+      certMainHost = "syden.immae.eu";
+      hosts        = [ "syden.immae.eu" ];
+      root         = null;
+      extraConfig  = [ ''
           RewriteEngine On
 
           RewriteCond %{REQUEST_URI}  ^/socket.io            [NC]