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 | |
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')
10 files changed, 24 insertions, 24 deletions
diff --git a/modules/private/websites/tools/cloud/default.nix b/modules/private/websites/tools/cloud/default.nix index ceb8f77..fffe04c 100644 --- a/modules/private/websites/tools/cloud/default.nix +++ b/modules/private/websites/tools/cloud/default.nix | |||
@@ -48,9 +48,9 @@ in { | |||
48 | }; | 48 | }; |
49 | 49 | ||
50 | config = lib.mkIf cfg.enable { | 50 | config = lib.mkIf cfg.enable { |
51 | services.websites.tools.modules = [ "proxy_fcgi" ]; | 51 | services.websites.env.tools.modules = [ "proxy_fcgi" ]; |
52 | 52 | ||
53 | services.websites.tools.vhostConfs.cloud = { | 53 | services.websites.env.tools.vhostConfs.cloud = { |
54 | certName = "eldiron"; | 54 | certName = "eldiron"; |
55 | addToCerts = true; | 55 | addToCerts = true; |
56 | hosts = ["cloud.immae.eu" ]; | 56 | hosts = ["cloud.immae.eu" ]; |
diff --git a/modules/private/websites/tools/dav/default.nix b/modules/private/websites/tools/dav/default.nix index fb0baae..5a0f470 100644 --- a/modules/private/websites/tools/dav/default.nix +++ b/modules/private/websites/tools/dav/default.nix | |||
@@ -29,9 +29,9 @@ in { | |||
29 | config = lib.mkIf cfg.enable { | 29 | config = lib.mkIf cfg.enable { |
30 | system.activationScripts.davical = davical.activationScript; | 30 | system.activationScripts.davical = davical.activationScript; |
31 | secrets.keys = davical.keys; | 31 | secrets.keys = davical.keys; |
32 | services.websites.tools.modules = davical.apache.modules; | 32 | services.websites.env.tools.modules = davical.apache.modules; |
33 | 33 | ||
34 | services.websites.tools.vhostConfs.dav = { | 34 | services.websites.env.tools.vhostConfs.dav = { |
35 | certName = "eldiron"; | 35 | certName = "eldiron"; |
36 | addToCerts = true; | 36 | addToCerts = true; |
37 | hosts = ["dav.immae.eu" ]; | 37 | hosts = ["dav.immae.eu" ]; |
diff --git a/modules/private/websites/tools/db/default.nix b/modules/private/websites/tools/db/default.nix index 361e204..60592e5 100644 --- a/modules/private/websites/tools/db/default.nix +++ b/modules/private/websites/tools/db/default.nix | |||
@@ -9,8 +9,8 @@ in { | |||
9 | }; | 9 | }; |
10 | 10 | ||
11 | config = lib.mkIf cfg.enable { | 11 | config = lib.mkIf cfg.enable { |
12 | services.websites.tools.modules = adminer.apache.modules; | 12 | services.websites.env.tools.modules = adminer.apache.modules; |
13 | services.websites.tools.vhostConfs.db-1 = { | 13 | services.websites.env.tools.vhostConfs.db-1 = { |
14 | certName = "eldiron"; | 14 | certName = "eldiron"; |
15 | addToCerts = true; | 15 | addToCerts = true; |
16 | hosts = ["db-1.immae.eu" ]; | 16 | hosts = ["db-1.immae.eu" ]; |
diff --git a/modules/private/websites/tools/diaspora/default.nix b/modules/private/websites/tools/diaspora/default.nix index 6742a81..17a6a09 100644 --- a/modules/private/websites/tools/diaspora/default.nix +++ b/modules/private/websites/tools/diaspora/default.nix | |||
@@ -150,14 +150,14 @@ in { | |||
150 | paths = [ dcfg.configDir ]; | 150 | paths = [ dcfg.configDir ]; |
151 | }; | 151 | }; |
152 | 152 | ||
153 | services.websites.tools.modules = [ | 153 | services.websites.env.tools.modules = [ |
154 | "headers" "proxy" "proxy_http" | 154 | "headers" "proxy" "proxy_http" |
155 | ]; | 155 | ]; |
156 | system.extraSystemBuilderCmds = '' | 156 | system.extraSystemBuilderCmds = '' |
157 | mkdir -p $out/webapps | 157 | mkdir -p $out/webapps |
158 | ln -s ${dcfg.workdir}/public/ $out/webapps/tools_diaspora | 158 | ln -s ${dcfg.workdir}/public/ $out/webapps/tools_diaspora |
159 | ''; | 159 | ''; |
160 | services.websites.tools.vhostConfs.diaspora = { | 160 | services.websites.env.tools.vhostConfs.diaspora = { |
161 | certName = "eldiron"; | 161 | certName = "eldiron"; |
162 | addToCerts = true; | 162 | addToCerts = true; |
163 | hosts = [ "diaspora.immae.eu" ]; | 163 | hosts = [ "diaspora.immae.eu" ]; |
diff --git a/modules/private/websites/tools/ether/default.nix b/modules/private/websites/tools/ether/default.nix index 3e68d54..c038528 100644 --- a/modules/private/websites/tools/ether/default.nix +++ b/modules/private/websites/tools/ether/default.nix | |||
@@ -138,10 +138,10 @@ in { | |||
138 | paths = [ ecfg.sessionKeyFile ecfg.apiKeyFile ecfg.configFile ]; | 138 | paths = [ ecfg.sessionKeyFile ecfg.apiKeyFile ecfg.configFile ]; |
139 | }; | 139 | }; |
140 | 140 | ||
141 | services.websites.tools.modules = [ | 141 | services.websites.env.tools.modules = [ |
142 | "headers" "proxy" "proxy_http" "proxy_wstunnel" | 142 | "headers" "proxy" "proxy_http" "proxy_wstunnel" |
143 | ]; | 143 | ]; |
144 | services.websites.tools.vhostConfs.etherpad-lite = { | 144 | services.websites.env.tools.vhostConfs.etherpad-lite = { |
145 | certName = "eldiron"; | 145 | certName = "eldiron"; |
146 | addToCerts = true; | 146 | addToCerts = true; |
147 | hosts = [ "ether.immae.eu" ]; | 147 | hosts = [ "ether.immae.eu" ]; |
diff --git a/modules/private/websites/tools/git/default.nix b/modules/private/websites/tools/git/default.nix index 75d0240..d66d151 100644 --- a/modules/private/websites/tools/git/default.nix +++ b/modules/private/websites/tools/git/default.nix | |||
@@ -16,14 +16,14 @@ in { | |||
16 | 16 | ||
17 | config = lib.mkIf cfg.enable { | 17 | config = lib.mkIf cfg.enable { |
18 | secrets.keys = mantisbt.keys; | 18 | secrets.keys = mantisbt.keys; |
19 | services.websites.tools.modules = | 19 | services.websites.env.tools.modules = |
20 | gitweb.apache.modules ++ | 20 | gitweb.apache.modules ++ |
21 | mantisbt.apache.modules; | 21 | mantisbt.apache.modules; |
22 | myServices.websites.webappDirs."${gitweb.apache.webappName}" = gitweb.webRoot; | 22 | myServices.websites.webappDirs."${gitweb.apache.webappName}" = gitweb.webRoot; |
23 | myServices.websites.webappDirs."${mantisbt.apache.webappName}" = mantisbt.webRoot; | 23 | myServices.websites.webappDirs."${mantisbt.apache.webappName}" = mantisbt.webRoot; |
24 | 24 | ||
25 | system.activationScripts.mantisbt = mantisbt.activationScript; | 25 | system.activationScripts.mantisbt = mantisbt.activationScript; |
26 | services.websites.tools.vhostConfs.git = { | 26 | services.websites.env.tools.vhostConfs.git = { |
27 | certName = "eldiron"; | 27 | certName = "eldiron"; |
28 | addToCerts = true; | 28 | addToCerts = true; |
29 | hosts = ["git.immae.eu" ]; | 29 | hosts = ["git.immae.eu" ]; |
diff --git a/modules/private/websites/tools/mastodon/default.nix b/modules/private/websites/tools/mastodon/default.nix index 1a4b387..d67ae2b 100644 --- a/modules/private/websites/tools/mastodon/default.nix +++ b/modules/private/websites/tools/mastodon/default.nix | |||
@@ -77,14 +77,14 @@ in { | |||
77 | }; | 77 | }; |
78 | 78 | ||
79 | 79 | ||
80 | services.websites.tools.modules = [ | 80 | services.websites.env.tools.modules = [ |
81 | "headers" "proxy" "proxy_wstunnel" "proxy_http" | 81 | "headers" "proxy" "proxy_wstunnel" "proxy_http" |
82 | ]; | 82 | ]; |
83 | system.extraSystemBuilderCmds = '' | 83 | system.extraSystemBuilderCmds = '' |
84 | mkdir -p $out/webapps | 84 | mkdir -p $out/webapps |
85 | ln -s ${mcfg.workdir}/public/ $out/webapps/tools_mastodon | 85 | ln -s ${mcfg.workdir}/public/ $out/webapps/tools_mastodon |
86 | ''; | 86 | ''; |
87 | services.websites.tools.vhostConfs.mastodon = { | 87 | services.websites.env.tools.vhostConfs.mastodon = { |
88 | certName = "eldiron"; | 88 | certName = "eldiron"; |
89 | addToCerts = true; | 89 | addToCerts = true; |
90 | hosts = ["mastodon.immae.eu" ]; | 90 | hosts = ["mastodon.immae.eu" ]; |
diff --git a/modules/private/websites/tools/mgoblin/default.nix b/modules/private/websites/tools/mgoblin/default.nix index 1d398db..b99b95e 100644 --- a/modules/private/websites/tools/mgoblin/default.nix +++ b/modules/private/websites/tools/mgoblin/default.nix | |||
@@ -87,11 +87,11 @@ in { | |||
87 | paths = [ mcfg.configFile ]; | 87 | paths = [ mcfg.configFile ]; |
88 | }; | 88 | }; |
89 | 89 | ||
90 | services.websites.tools.modules = [ | 90 | services.websites.env.tools.modules = [ |
91 | "proxy" "proxy_http" | 91 | "proxy" "proxy_http" |
92 | ]; | 92 | ]; |
93 | users.users.wwwrun.extraGroups = [ "mediagoblin" ]; | 93 | users.users.wwwrun.extraGroups = [ "mediagoblin" ]; |
94 | services.websites.tools.vhostConfs.mgoblin = { | 94 | services.websites.env.tools.vhostConfs.mgoblin = { |
95 | certName = "eldiron"; | 95 | certName = "eldiron"; |
96 | addToCerts = true; | 96 | addToCerts = true; |
97 | hosts = ["mgoblin.immae.eu" ]; | 97 | hosts = ["mgoblin.immae.eu" ]; |
diff --git a/modules/private/websites/tools/peertube/default.nix b/modules/private/websites/tools/peertube/default.nix index dd28530..f34acaa 100644 --- a/modules/private/websites/tools/peertube/default.nix +++ b/modules/private/websites/tools/peertube/default.nix | |||
@@ -150,7 +150,7 @@ in { | |||
150 | ''; | 150 | ''; |
151 | }]; | 151 | }]; |
152 | 152 | ||
153 | services.websites.tools.modules = [ | 153 | services.websites.env.tools.modules = [ |
154 | "headers" "proxy" "proxy_http" "proxy_wstunnel" | 154 | "headers" "proxy" "proxy_http" "proxy_wstunnel" |
155 | ]; | 155 | ]; |
156 | services.filesWatcher.peertube = { | 156 | services.filesWatcher.peertube = { |
@@ -158,7 +158,7 @@ in { | |||
158 | paths = [ pcfg.configFile ]; | 158 | paths = [ pcfg.configFile ]; |
159 | }; | 159 | }; |
160 | 160 | ||
161 | services.websites.tools.vhostConfs.peertube = { | 161 | services.websites.env.tools.vhostConfs.peertube = { |
162 | certName = "eldiron"; | 162 | certName = "eldiron"; |
163 | addToCerts = true; | 163 | addToCerts = true; |
164 | hosts = [ "peertube.immae.eu" ]; | 164 | hosts = [ "peertube.immae.eu" ]; |
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 = { |