diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-05-10 14:56:43 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-05-10 14:56:43 +0200 |
commit | 1a7188052f235fb632700478fad0108e4306107d (patch) | |
tree | 046b43c711a161190e99953c709cd69aaa49b724 /nixops/modules/websites/tools | |
parent | d42bbbe6f510fce233ecb66d44d205761390b56e (diff) | |
download | Nix-1a7188052f235fb632700478fad0108e4306107d.tar.gz Nix-1a7188052f235fb632700478fad0108e4306107d.tar.zst Nix-1a7188052f235fb632700478fad0108e4306107d.zip |
Move secrets module outside of nixops
Diffstat (limited to 'nixops/modules/websites/tools')
-rw-r--r-- | nixops/modules/websites/tools/cloud.nix | 2 | ||||
-rw-r--r-- | nixops/modules/websites/tools/dav/default.nix | 2 | ||||
-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 | 2 | ||||
-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 | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/nixops/modules/websites/tools/cloud.nix b/nixops/modules/websites/tools/cloud.nix index a7fcd61..8af2914 100644 --- a/nixops/modules/websites/tools/cloud.nix +++ b/nixops/modules/websites/tools/cloud.nix | |||
@@ -80,7 +80,7 @@ in { | |||
80 | ]; | 80 | ]; |
81 | }; | 81 | }; |
82 | 82 | ||
83 | mySecrets.keys = [{ | 83 | secrets.keys = [{ |
84 | dest = "webapps/tools-nextcloud"; | 84 | dest = "webapps/tools-nextcloud"; |
85 | user = "wwwrun"; | 85 | user = "wwwrun"; |
86 | group = "wwwrun"; | 86 | group = "wwwrun"; |
diff --git a/nixops/modules/websites/tools/dav/default.nix b/nixops/modules/websites/tools/dav/default.nix index c24f8db..bf5e412 100644 --- a/nixops/modules/websites/tools/dav/default.nix +++ b/nixops/modules/websites/tools/dav/default.nix | |||
@@ -29,7 +29,7 @@ in { | |||
29 | config = lib.mkIf cfg.enable { | 29 | config = lib.mkIf cfg.enable { |
30 | security.acme.certs."eldiron".extraDomains."dav.immae.eu" = null; | 30 | security.acme.certs."eldiron".extraDomains."dav.immae.eu" = null; |
31 | 31 | ||
32 | mySecrets.keys = davical.keys; | 32 | secrets.keys = davical.keys; |
33 | services.myWebsites.tools.modules = davical.apache.modules; | 33 | services.myWebsites.tools.modules = davical.apache.modules; |
34 | 34 | ||
35 | services.myWebsites.tools.vhostConfs.dav = { | 35 | services.myWebsites.tools.vhostConfs.dav = { |
diff --git a/nixops/modules/websites/tools/diaspora.nix b/nixops/modules/websites/tools/diaspora.nix index 53989b7..1088e71 100644 --- a/nixops/modules/websites/tools/diaspora.nix +++ b/nixops/modules/websites/tools/diaspora.nix | |||
@@ -35,7 +35,7 @@ in { | |||
35 | }; | 35 | }; |
36 | 36 | ||
37 | users.groups.diaspora.gid = config.ids.gids.diaspora; | 37 | users.groups.diaspora.gid = config.ids.gids.diaspora; |
38 | mySecrets.keys = [ | 38 | secrets.keys = [ |
39 | { | 39 | { |
40 | dest = "webapps/diaspora/diaspora.yml"; | 40 | dest = "webapps/diaspora/diaspora.yml"; |
41 | user = "diaspora"; | 41 | user = "diaspora"; |
diff --git a/nixops/modules/websites/tools/ether.nix b/nixops/modules/websites/tools/ether.nix index 1c952af..80472f0 100644 --- a/nixops/modules/websites/tools/ether.nix +++ b/nixops/modules/websites/tools/ether.nix | |||
@@ -14,7 +14,7 @@ in { | |||
14 | }; | 14 | }; |
15 | 15 | ||
16 | config = lib.mkIf cfg.enable { | 16 | config = lib.mkIf cfg.enable { |
17 | mySecrets.keys = [ | 17 | secrets.keys = [ |
18 | { | 18 | { |
19 | dest = "webapps/tools-etherpad-apikey"; | 19 | dest = "webapps/tools-etherpad-apikey"; |
20 | permissions = "0400"; | 20 | permissions = "0400"; |
diff --git a/nixops/modules/websites/tools/git/default.nix b/nixops/modules/websites/tools/git/default.nix index e7dbd6f..799c180 100644 --- a/nixops/modules/websites/tools/git/default.nix +++ b/nixops/modules/websites/tools/git/default.nix | |||
@@ -16,7 +16,7 @@ in { | |||
16 | config = lib.mkIf cfg.enable { | 16 | config = lib.mkIf cfg.enable { |
17 | security.acme.certs."eldiron".extraDomains."git.immae.eu" = null; | 17 | security.acme.certs."eldiron".extraDomains."git.immae.eu" = null; |
18 | 18 | ||
19 | mySecrets.keys = mantisbt.keys; | 19 | secrets.keys = mantisbt.keys; |
20 | services.myWebsites.tools.modules = | 20 | services.myWebsites.tools.modules = |
21 | gitweb.apache.modules ++ | 21 | gitweb.apache.modules ++ |
22 | mantisbt.apache.modules; | 22 | mantisbt.apache.modules; |
diff --git a/nixops/modules/websites/tools/mastodon.nix b/nixops/modules/websites/tools/mastodon.nix index 3279cf8..c461bec 100644 --- a/nixops/modules/websites/tools/mastodon.nix +++ b/nixops/modules/websites/tools/mastodon.nix | |||
@@ -16,7 +16,7 @@ in { | |||
16 | }; | 16 | }; |
17 | 17 | ||
18 | config = lib.mkIf cfg.enable { | 18 | config = lib.mkIf cfg.enable { |
19 | mySecrets.keys = [{ | 19 | secrets.keys = [{ |
20 | dest = "webapps/tools-mastodon"; | 20 | dest = "webapps/tools-mastodon"; |
21 | user = "mastodon"; | 21 | user = "mastodon"; |
22 | group = "mastodon"; | 22 | group = "mastodon"; |
diff --git a/nixops/modules/websites/tools/mediagoblin.nix b/nixops/modules/websites/tools/mediagoblin.nix index bdb8323..bf45e8e 100644 --- a/nixops/modules/websites/tools/mediagoblin.nix +++ b/nixops/modules/websites/tools/mediagoblin.nix | |||
@@ -9,7 +9,7 @@ in { | |||
9 | }; | 9 | }; |
10 | 10 | ||
11 | config = lib.mkIf cfg.enable { | 11 | config = lib.mkIf cfg.enable { |
12 | mySecrets.keys = [{ | 12 | secrets.keys = [{ |
13 | dest = "webapps/tools-mediagoblin"; | 13 | dest = "webapps/tools-mediagoblin"; |
14 | user = "mediagoblin"; | 14 | user = "mediagoblin"; |
15 | group = "mediagoblin"; | 15 | group = "mediagoblin"; |
diff --git a/nixops/modules/websites/tools/peertube.nix b/nixops/modules/websites/tools/peertube.nix index 9a56a85..ab5e08a 100644 --- a/nixops/modules/websites/tools/peertube.nix +++ b/nixops/modules/websites/tools/peertube.nix | |||
@@ -16,7 +16,7 @@ in { | |||
16 | }; | 16 | }; |
17 | users.users.peertube.extraGroups = [ "keys" ]; | 17 | users.users.peertube.extraGroups = [ "keys" ]; |
18 | 18 | ||
19 | mySecrets.keys = [{ | 19 | secrets.keys = [{ |
20 | dest = "webapps/tools-peertube"; | 20 | dest = "webapps/tools-peertube"; |
21 | user = "peertube"; | 21 | user = "peertube"; |
22 | group = "peertube"; | 22 | group = "peertube"; |
diff --git a/nixops/modules/websites/tools/tools/default.nix b/nixops/modules/websites/tools/tools/default.nix index addb2c3..7a14e12 100644 --- a/nixops/modules/websites/tools/tools/default.nix +++ b/nixops/modules/websites/tools/tools/default.nix | |||
@@ -49,7 +49,7 @@ in { | |||
49 | security.acme.certs."eldiron".extraDomains."tools.immae.eu" = null; | 49 | security.acme.certs."eldiron".extraDomains."tools.immae.eu" = null; |
50 | security.acme.certs."eldiron".extraDomains."devtools.immae.eu" = null; | 50 | security.acme.certs."eldiron".extraDomains."devtools.immae.eu" = null; |
51 | 51 | ||
52 | mySecrets.keys = | 52 | secrets.keys = |
53 | kanboard.keys | 53 | kanboard.keys |
54 | ++ ldap.keys | 54 | ++ ldap.keys |
55 | ++ roundcubemail.keys | 55 | ++ roundcubemail.keys |