diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-06-01 12:51:51 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-06-01 13:32:32 +0200 |
commit | 29f8cb850d74b456d6481a456311bbf5361d328c (patch) | |
tree | 2bdcdc21780950683d0528da66b050f2a24e3b20 /modules/private/websites/tools/tools/default.nix | |
parent | 2e48907d64491a06454b342a1a56d03a0835753d (diff) | |
download | Nix-29f8cb850d74b456d6481a456311bbf5361d328c.tar.gz Nix-29f8cb850d74b456d6481a456311bbf5361d328c.tar.zst Nix-29f8cb850d74b456d6481a456311bbf5361d328c.zip |
Refactor websites options
Diffstat (limited to 'modules/private/websites/tools/tools/default.nix')
-rw-r--r-- | modules/private/websites/tools/tools/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/modules/private/websites/tools/tools/default.nix b/modules/private/websites/tools/tools/default.nix index d75def4..5ca9851 100644 --- a/modules/private/websites/tools/tools/default.nix +++ b/modules/private/websites/tools/tools/default.nix | |||
@@ -57,10 +57,10 @@ in { | |||
57 | ++ wallabag.keys | 57 | ++ wallabag.keys |
58 | ++ yourls.keys; | 58 | ++ yourls.keys; |
59 | 59 | ||
60 | services.websites.integration.modules = | 60 | services.websites.env.integration.modules = |
61 | rainloop.apache.modules; | 61 | rainloop.apache.modules; |
62 | 62 | ||
63 | services.websites.tools.modules = | 63 | services.websites.env.tools.modules = |
64 | [ "proxy_fcgi" ] | 64 | [ "proxy_fcgi" ] |
65 | ++ adminer.apache.modules | 65 | ++ adminer.apache.modules |
66 | ++ ympd.apache.modules | 66 | ++ ympd.apache.modules |
@@ -74,7 +74,7 @@ in { | |||
74 | ++ ldap.apache.modules | 74 | ++ ldap.apache.modules |
75 | ++ kanboard.apache.modules; | 75 | ++ kanboard.apache.modules; |
76 | 76 | ||
77 | services.websites.integration.vhostConfs.devtools = { | 77 | services.websites.env.integration.vhostConfs.devtools = { |
78 | certName = "eldiron"; | 78 | certName = "eldiron"; |
79 | addToCerts = true; | 79 | addToCerts = true; |
80 | hosts = ["devtools.immae.eu" ]; | 80 | hosts = ["devtools.immae.eu" ]; |
@@ -94,7 +94,7 @@ in { | |||
94 | ]; | 94 | ]; |
95 | }; | 95 | }; |
96 | 96 | ||
97 | services.websites.tools.vhostConfs.tools = { | 97 | services.websites.env.tools.vhostConfs.tools = { |
98 | certName = "eldiron"; | 98 | certName = "eldiron"; |
99 | addToCerts = true; | 99 | addToCerts = true; |
100 | hosts = ["tools.immae.eu" ]; | 100 | hosts = ["tools.immae.eu" ]; |
@@ -124,7 +124,7 @@ in { | |||
124 | ]; | 124 | ]; |
125 | }; | 125 | }; |
126 | 126 | ||
127 | services.websites.tools.vhostConfs.outils = { | 127 | services.websites.env.tools.vhostConfs.outils = { |
128 | certName = "eldiron"; | 128 | certName = "eldiron"; |
129 | addToCerts = true; | 129 | addToCerts = true; |
130 | hosts = [ "outils.immae.eu" ]; | 130 | hosts = [ "outils.immae.eu" ]; |
@@ -302,7 +302,7 @@ in { | |||
302 | "${kanboard.apache.webappName}" = kanboard.webRoot; | 302 | "${kanboard.apache.webappName}" = kanboard.webRoot; |
303 | }; | 303 | }; |
304 | 304 | ||
305 | services.websites.tools.watchPaths = [ | 305 | services.websites.env.tools.watchPaths = [ |
306 | "/var/secrets/webapps/tools-wallabag" | 306 | "/var/secrets/webapps/tools-wallabag" |
307 | ]; | 307 | ]; |
308 | services.filesWatcher.phpfpm-wallabag = { | 308 | services.filesWatcher.phpfpm-wallabag = { |