Start moving websites configuration to modules

[perso/Immae/Config/Nix.git] / nixops / modules / websites / tools / mediagoblin.nix

diff --git a/nixops/modules/websites/tools/mediagoblin.nix b/nixops/modules/websites/tools/mediagoblin.nix
index bf45e8efddbf065db705c9949eaa11f9202e0bb1..8a6f03f1b13548dcba7a67ee0907046edc871a47 100644 (file)
--- a/nixops/modules/websites/tools/mediagoblin.nix
+++ b/nixops/modules/websites/tools/mediagoblin.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig,  ... }:
 let
   env = myconfig.env.tools.mediagoblin;
   cfg = config.services.myWebsites.tools.mediagoblin;
@@ -79,12 +79,12 @@ in {
       configFile = "/var/secrets/webapps/tools-mediagoblin";
     };
 
-    services.myWebsites.tools.modules = [
+    services.websites.tools.modules = [
       "proxy" "proxy_http"
     ];
     users.users.wwwrun.extraGroups = [ "mediagoblin" ];
     security.acme.certs."eldiron".extraDomains."mgoblin.immae.eu" = null;
-    services.myWebsites.tools.vhostConfs.mgoblin = {
+    services.websites.tools.vhostConfs.mgoblin = {
       certName    = "eldiron";
       hosts       = ["mgoblin.immae.eu" ];
       root        = null;
@@ -114,8 +114,8 @@ in {
         ProxyPass /theme_static !
         ProxyPass /plugin_static !
         ProxyPassMatch ^/.well-known/acme-challenge !
-        ProxyPass / unix://${mcfg.socketsDir}/mediagoblin.sock|http://mgoblin.immae.eu/
-        ProxyPassReverse / unix://${mcfg.socketsDir}/mediagoblin.sock|http://mgoblin.immae.eu/
+        ProxyPass / unix://${mcfg.sockets.paster}|http://mgoblin.immae.eu/
+        ProxyPassReverse / unix://${mcfg.sockets.paster}|http://mgoblin.immae.eu/
       '' ];
     };
   };