diff options
Diffstat (limited to 'nixops/modules/websites/tools')
-rw-r--r-- | nixops/modules/websites/tools/cloud.nix | 3 | ||||
-rw-r--r-- | nixops/modules/websites/tools/dav/default.nix | 3 | ||||
-rw-r--r-- | nixops/modules/websites/tools/db.nix | 3 | ||||
-rw-r--r-- | nixops/modules/websites/tools/diaspora.nix | 2 | ||||
-rw-r--r-- | nixops/modules/websites/tools/ether.nix | 2 | ||||
-rw-r--r-- | nixops/modules/websites/tools/git/default.nix | 3 | ||||
-rw-r--r-- | nixops/modules/websites/tools/mastodon.nix | 2 | ||||
-rw-r--r-- | nixops/modules/websites/tools/mediagoblin.nix | 2 | ||||
-rw-r--r-- | nixops/modules/websites/tools/peertube.nix | 2 | ||||
-rw-r--r-- | nixops/modules/websites/tools/tools/default.nix | 13 |
10 files changed, 15 insertions, 20 deletions
diff --git a/nixops/modules/websites/tools/cloud.nix b/nixops/modules/websites/tools/cloud.nix index 69b5fb0..5e010f4 100644 --- a/nixops/modules/websites/tools/cloud.nix +++ b/nixops/modules/websites/tools/cloud.nix | |||
@@ -49,12 +49,11 @@ in { | |||
49 | }; | 49 | }; |
50 | 50 | ||
51 | config = lib.mkIf cfg.enable { | 51 | config = lib.mkIf cfg.enable { |
52 | security.acme.certs."eldiron".extraDomains."cloud.immae.eu" = null; | ||
53 | |||
54 | services.websites.tools.modules = [ "proxy_fcgi" ]; | 52 | services.websites.tools.modules = [ "proxy_fcgi" ]; |
55 | 53 | ||
56 | services.websites.tools.vhostConfs.cloud = { | 54 | services.websites.tools.vhostConfs.cloud = { |
57 | certName = "eldiron"; | 55 | certName = "eldiron"; |
56 | addToCerts = true; | ||
58 | hosts = ["cloud.immae.eu" ]; | 57 | hosts = ["cloud.immae.eu" ]; |
59 | root = apacheRoot; | 58 | root = apacheRoot; |
60 | extraConfig = [ | 59 | extraConfig = [ |
diff --git a/nixops/modules/websites/tools/dav/default.nix b/nixops/modules/websites/tools/dav/default.nix index ea2105b..075cf48 100644 --- a/nixops/modules/websites/tools/dav/default.nix +++ b/nixops/modules/websites/tools/dav/default.nix | |||
@@ -27,13 +27,12 @@ in { | |||
27 | }; | 27 | }; |
28 | 28 | ||
29 | config = lib.mkIf cfg.enable { | 29 | config = lib.mkIf cfg.enable { |
30 | security.acme.certs."eldiron".extraDomains."dav.immae.eu" = null; | ||
31 | |||
32 | secrets.keys = davical.keys; | 30 | secrets.keys = davical.keys; |
33 | services.websites.tools.modules = davical.apache.modules; | 31 | services.websites.tools.modules = davical.apache.modules; |
34 | 32 | ||
35 | services.websites.tools.vhostConfs.dav = { | 33 | services.websites.tools.vhostConfs.dav = { |
36 | certName = "eldiron"; | 34 | certName = "eldiron"; |
35 | addToCerts = true; | ||
37 | hosts = ["dav.immae.eu" ]; | 36 | hosts = ["dav.immae.eu" ]; |
38 | root = null; | 37 | root = null; |
39 | extraConfig = [ | 38 | extraConfig = [ |
diff --git a/nixops/modules/websites/tools/db.nix b/nixops/modules/websites/tools/db.nix index 70650fa..7c15c23 100644 --- a/nixops/modules/websites/tools/db.nix +++ b/nixops/modules/websites/tools/db.nix | |||
@@ -9,11 +9,10 @@ in { | |||
9 | }; | 9 | }; |
10 | 10 | ||
11 | config = lib.mkIf cfg.enable { | 11 | config = lib.mkIf cfg.enable { |
12 | security.acme.certs."eldiron".extraDomains."db-1.immae.eu" = null; | ||
13 | |||
14 | services.websites.tools.modules = adminer.apache.modules; | 12 | services.websites.tools.modules = adminer.apache.modules; |
15 | services.websites.tools.vhostConfs.db-1 = { | 13 | services.websites.tools.vhostConfs.db-1 = { |
16 | certName = "eldiron"; | 14 | certName = "eldiron"; |
15 | addToCerts = true; | ||
17 | hosts = ["db-1.immae.eu" ]; | 16 | hosts = ["db-1.immae.eu" ]; |
18 | root = null; | 17 | root = null; |
19 | extraConfig = [ adminer.apache.vhostConf ]; | 18 | extraConfig = [ adminer.apache.vhostConf ]; |
diff --git a/nixops/modules/websites/tools/diaspora.nix b/nixops/modules/websites/tools/diaspora.nix index 221e01c..ee5507d 100644 --- a/nixops/modules/websites/tools/diaspora.nix +++ b/nixops/modules/websites/tools/diaspora.nix | |||
@@ -148,13 +148,13 @@ in { | |||
148 | services.websites.tools.modules = [ | 148 | services.websites.tools.modules = [ |
149 | "headers" "proxy" "proxy_http" | 149 | "headers" "proxy" "proxy_http" |
150 | ]; | 150 | ]; |
151 | security.acme.certs."eldiron".extraDomains."diaspora.immae.eu" = null; | ||
152 | system.extraSystemBuilderCmds = '' | 151 | system.extraSystemBuilderCmds = '' |
153 | mkdir -p $out/webapps | 152 | mkdir -p $out/webapps |
154 | ln -s ${dcfg.workdir}/public/ $out/webapps/tools_diaspora | 153 | ln -s ${dcfg.workdir}/public/ $out/webapps/tools_diaspora |
155 | ''; | 154 | ''; |
156 | services.websites.tools.vhostConfs.diaspora = { | 155 | services.websites.tools.vhostConfs.diaspora = { |
157 | certName = "eldiron"; | 156 | certName = "eldiron"; |
157 | addToCerts = true; | ||
158 | hosts = [ "diaspora.immae.eu" ]; | 158 | hosts = [ "diaspora.immae.eu" ]; |
159 | root = root; | 159 | root = root; |
160 | extraConfig = [ '' | 160 | extraConfig = [ '' |
diff --git a/nixops/modules/websites/tools/ether.nix b/nixops/modules/websites/tools/ether.nix index 6222b22..8c9bbb1 100644 --- a/nixops/modules/websites/tools/ether.nix +++ b/nixops/modules/websites/tools/ether.nix | |||
@@ -136,9 +136,9 @@ in { | |||
136 | services.websites.tools.modules = [ | 136 | services.websites.tools.modules = [ |
137 | "headers" "proxy" "proxy_http" "proxy_wstunnel" | 137 | "headers" "proxy" "proxy_http" "proxy_wstunnel" |
138 | ]; | 138 | ]; |
139 | security.acme.certs."eldiron".extraDomains."ether.immae.eu" = null; | ||
140 | services.websites.tools.vhostConfs.etherpad-lite = { | 139 | services.websites.tools.vhostConfs.etherpad-lite = { |
141 | certName = "eldiron"; | 140 | certName = "eldiron"; |
141 | addToCerts = true; | ||
142 | hosts = [ "ether.immae.eu" ]; | 142 | hosts = [ "ether.immae.eu" ]; |
143 | root = null; | 143 | root = null; |
144 | extraConfig = [ '' | 144 | extraConfig = [ '' |
diff --git a/nixops/modules/websites/tools/git/default.nix b/nixops/modules/websites/tools/git/default.nix index ea0d971..064d3dd 100644 --- a/nixops/modules/websites/tools/git/default.nix +++ b/nixops/modules/websites/tools/git/default.nix | |||
@@ -13,8 +13,6 @@ in { | |||
13 | }; | 13 | }; |
14 | 14 | ||
15 | config = lib.mkIf cfg.enable { | 15 | config = lib.mkIf cfg.enable { |
16 | security.acme.certs."eldiron".extraDomains."git.immae.eu" = null; | ||
17 | |||
18 | secrets.keys = mantisbt.keys; | 16 | secrets.keys = mantisbt.keys; |
19 | services.websites.tools.modules = | 17 | services.websites.tools.modules = |
20 | gitweb.apache.modules ++ | 18 | gitweb.apache.modules ++ |
@@ -27,6 +25,7 @@ in { | |||
27 | 25 | ||
28 | services.websites.tools.vhostConfs.git = { | 26 | services.websites.tools.vhostConfs.git = { |
29 | certName = "eldiron"; | 27 | certName = "eldiron"; |
28 | addToCerts = true; | ||
30 | hosts = ["git.immae.eu" ]; | 29 | hosts = ["git.immae.eu" ]; |
31 | root = gitweb.apache.root; | 30 | root = gitweb.apache.root; |
32 | extraConfig = [ | 31 | extraConfig = [ |
diff --git a/nixops/modules/websites/tools/mastodon.nix b/nixops/modules/websites/tools/mastodon.nix index 38b2107..ffd59dd 100644 --- a/nixops/modules/websites/tools/mastodon.nix +++ b/nixops/modules/websites/tools/mastodon.nix | |||
@@ -67,13 +67,13 @@ in { | |||
67 | services.websites.tools.modules = [ | 67 | services.websites.tools.modules = [ |
68 | "headers" "proxy" "proxy_wstunnel" "proxy_http" | 68 | "headers" "proxy" "proxy_wstunnel" "proxy_http" |
69 | ]; | 69 | ]; |
70 | security.acme.certs."eldiron".extraDomains."mastodon.immae.eu" = null; | ||
71 | system.extraSystemBuilderCmds = '' | 70 | system.extraSystemBuilderCmds = '' |
72 | mkdir -p $out/webapps | 71 | mkdir -p $out/webapps |
73 | ln -s ${mcfg.workdir}/public/ $out/webapps/tools_mastodon | 72 | ln -s ${mcfg.workdir}/public/ $out/webapps/tools_mastodon |
74 | ''; | 73 | ''; |
75 | services.websites.tools.vhostConfs.mastodon = { | 74 | services.websites.tools.vhostConfs.mastodon = { |
76 | certName = "eldiron"; | 75 | certName = "eldiron"; |
76 | addToCerts = true; | ||
77 | hosts = ["mastodon.immae.eu" ]; | 77 | hosts = ["mastodon.immae.eu" ]; |
78 | root = root; | 78 | root = root; |
79 | extraConfig = [ '' | 79 | extraConfig = [ '' |
diff --git a/nixops/modules/websites/tools/mediagoblin.nix b/nixops/modules/websites/tools/mediagoblin.nix index 8a6f03f..eb56b35 100644 --- a/nixops/modules/websites/tools/mediagoblin.nix +++ b/nixops/modules/websites/tools/mediagoblin.nix | |||
@@ -83,9 +83,9 @@ in { | |||
83 | "proxy" "proxy_http" | 83 | "proxy" "proxy_http" |
84 | ]; | 84 | ]; |
85 | users.users.wwwrun.extraGroups = [ "mediagoblin" ]; | 85 | users.users.wwwrun.extraGroups = [ "mediagoblin" ]; |
86 | security.acme.certs."eldiron".extraDomains."mgoblin.immae.eu" = null; | ||
87 | services.websites.tools.vhostConfs.mgoblin = { | 86 | services.websites.tools.vhostConfs.mgoblin = { |
88 | certName = "eldiron"; | 87 | certName = "eldiron"; |
88 | addToCerts = true; | ||
89 | hosts = ["mgoblin.immae.eu" ]; | 89 | hosts = ["mgoblin.immae.eu" ]; |
90 | root = null; | 90 | root = null; |
91 | extraConfig = [ '' | 91 | extraConfig = [ '' |
diff --git a/nixops/modules/websites/tools/peertube.nix b/nixops/modules/websites/tools/peertube.nix index 6cc6d38..12ab3c4 100644 --- a/nixops/modules/websites/tools/peertube.nix +++ b/nixops/modules/websites/tools/peertube.nix | |||
@@ -153,9 +153,9 @@ in { | |||
153 | services.websites.tools.modules = [ | 153 | services.websites.tools.modules = [ |
154 | "headers" "proxy" "proxy_http" "proxy_wstunnel" | 154 | "headers" "proxy" "proxy_http" "proxy_wstunnel" |
155 | ]; | 155 | ]; |
156 | security.acme.certs."eldiron".extraDomains."peertube.immae.eu" = null; | ||
157 | services.websites.tools.vhostConfs.peertube = { | 156 | services.websites.tools.vhostConfs.peertube = { |
158 | certName = "eldiron"; | 157 | certName = "eldiron"; |
158 | addToCerts = true; | ||
159 | hosts = [ "peertube.immae.eu" ]; | 159 | hosts = [ "peertube.immae.eu" ]; |
160 | root = null; | 160 | root = null; |
161 | extraConfig = [ '' | 161 | extraConfig = [ '' |
diff --git a/nixops/modules/websites/tools/tools/default.nix b/nixops/modules/websites/tools/tools/default.nix index 5e84f45..061c004 100644 --- a/nixops/modules/websites/tools/tools/default.nix +++ b/nixops/modules/websites/tools/tools/default.nix | |||
@@ -46,9 +46,6 @@ in { | |||
46 | }; | 46 | }; |
47 | 47 | ||
48 | config = lib.mkIf cfg.enable { | 48 | config = lib.mkIf cfg.enable { |
49 | security.acme.certs."eldiron".extraDomains."tools.immae.eu" = null; | ||
50 | security.acme.certs."eldiron".extraDomains."devtools.immae.eu" = null; | ||
51 | |||
52 | secrets.keys = | 49 | secrets.keys = |
53 | kanboard.keys | 50 | kanboard.keys |
54 | ++ ldap.keys | 51 | ++ ldap.keys |
@@ -86,6 +83,7 @@ in { | |||
86 | 83 | ||
87 | services.websites.integration.vhostConfs.devtools = { | 84 | services.websites.integration.vhostConfs.devtools = { |
88 | certName = "eldiron"; | 85 | certName = "eldiron"; |
86 | addToCerts = true; | ||
89 | hosts = ["devtools.immae.eu" ]; | 87 | hosts = ["devtools.immae.eu" ]; |
90 | root = "/var/lib/ftp/devtools.immae.eu"; | 88 | root = "/var/lib/ftp/devtools.immae.eu"; |
91 | extraConfig = [ | 89 | extraConfig = [ |
@@ -105,6 +103,7 @@ in { | |||
105 | 103 | ||
106 | services.websites.tools.vhostConfs.tools = { | 104 | services.websites.tools.vhostConfs.tools = { |
107 | certName = "eldiron"; | 105 | certName = "eldiron"; |
106 | addToCerts = true; | ||
108 | hosts = ["tools.immae.eu" ]; | 107 | hosts = ["tools.immae.eu" ]; |
109 | root = "/var/lib/ftp/tools.immae.eu"; | 108 | root = "/var/lib/ftp/tools.immae.eu"; |
110 | extraConfig = [ | 109 | extraConfig = [ |
@@ -132,11 +131,11 @@ in { | |||
132 | ]; | 131 | ]; |
133 | }; | 132 | }; |
134 | 133 | ||
135 | security.acme.certs."eldiron".extraDomains."outils.immae.eu" = null; | ||
136 | services.websites.tools.vhostConfs.outils = { | 134 | services.websites.tools.vhostConfs.outils = { |
137 | certName = "eldiron"; | 135 | certName = "eldiron"; |
138 | hosts = [ "outils.immae.eu" ]; | 136 | addToCerts = true; |
139 | root = null; | 137 | hosts = [ "outils.immae.eu" ]; |
138 | root = null; | ||
140 | extraConfig = [ | 139 | extraConfig = [ |
141 | '' | 140 | '' |
142 | RedirectMatch 301 ^/mediagoblin(.*)$ https://mgoblin.immae.eu$1 | 141 | RedirectMatch 301 ^/mediagoblin(.*)$ https://mgoblin.immae.eu$1 |