diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-04-25 09:26:26 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-04-25 09:26:26 +0200 |
commit | 8db8e666707a0e51af9353c76c5863e1a5482ed5 (patch) | |
tree | 64bfdc2cb62f84250955424ad202fc875d4ddbc4 /nixops/modules/websites/tools/cloud | |
parent | 32c84ff89c2b8931f58cea63961a178a9b1d0efe (diff) | |
download | Nix-8db8e666707a0e51af9353c76c5863e1a5482ed5.tar.gz Nix-8db8e666707a0e51af9353c76c5863e1a5482ed5.tar.zst Nix-8db8e666707a0e51af9353c76c5863e1a5482ed5.zip |
Move tools to new secrets location
Diffstat (limited to 'nixops/modules/websites/tools/cloud')
-rw-r--r-- | nixops/modules/websites/tools/cloud/default.nix | 2 | ||||
-rw-r--r-- | nixops/modules/websites/tools/cloud/nextcloud.nix | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/nixops/modules/websites/tools/cloud/default.nix b/nixops/modules/websites/tools/cloud/default.nix index 7dd37f5..5c3e9a8 100644 --- a/nixops/modules/websites/tools/cloud/default.nix +++ b/nixops/modules/websites/tools/cloud/default.nix | |||
@@ -24,7 +24,7 @@ in { | |||
24 | ]; | 24 | ]; |
25 | }; | 25 | }; |
26 | 26 | ||
27 | deployment.keys = nextcloud.keys; | 27 | mySecrets.keys = nextcloud.keys; |
28 | users.users.root.packages = let | 28 | users.users.root.packages = let |
29 | occ = pkgs.writeScriptBin "nextcloud-occ" '' | 29 | occ = pkgs.writeScriptBin "nextcloud-occ" '' |
30 | #! ${pkgs.stdenv.shell} | 30 | #! ${pkgs.stdenv.shell} |
diff --git a/nixops/modules/websites/tools/cloud/nextcloud.nix b/nixops/modules/websites/tools/cloud/nextcloud.nix index b339038..b62606f 100644 --- a/nixops/modules/websites/tools/cloud/nextcloud.nix +++ b/nixops/modules/websites/tools/cloud/nextcloud.nix | |||
@@ -113,8 +113,8 @@ let | |||
113 | }; | 113 | }; |
114 | in rec { | 114 | in rec { |
115 | varDir = "/var/lib/nextcloud"; | 115 | varDir = "/var/lib/nextcloud"; |
116 | keys.tools-nextcloud = { | 116 | keys = [{ |
117 | destDir = "/run/keys/webapps"; | 117 | dest = "webapps/tools-nextcloud"; |
118 | user = apache.user; | 118 | user = apache.user; |
119 | group = apache.group; | 119 | group = apache.group; |
120 | permissions = "0600"; | 120 | permissions = "0600"; |
@@ -170,7 +170,7 @@ let | |||
170 | 'ldapProviderFactory' => '\\OCA\\User_LDAP\\LDAPProviderFactory', | 170 | 'ldapProviderFactory' => '\\OCA\\User_LDAP\\LDAPProviderFactory', |
171 | ); | 171 | ); |
172 | ''; | 172 | ''; |
173 | }; | 173 | }]; |
174 | webRoot = stdenv.mkDerivation rec { | 174 | webRoot = stdenv.mkDerivation rec { |
175 | name = "nextcloud-${version}"; | 175 | name = "nextcloud-${version}"; |
176 | version = "15.0.4"; | 176 | version = "15.0.4"; |
@@ -204,7 +204,7 @@ let | |||
204 | install -m 0755 -o ${apache.user} -g ${apache.group} -d ${varDir} | 204 | install -m 0755 -o ${apache.user} -g ${apache.group} -d ${varDir} |
205 | install -m 0750 -o ${apache.user} -g ${apache.group} -d ${varDir}/phpSessions | 205 | install -m 0750 -o ${apache.user} -g ${apache.group} -d ${varDir}/phpSessions |
206 | install -D -m 0644 -o ${apache.user} -g ${apache.group} ${./nextcloud-config}/* -t ${varDir}/config | 206 | install -D -m 0644 -o ${apache.user} -g ${apache.group} ${./nextcloud-config}/* -t ${varDir}/config |
207 | install -D -m 0600 -o ${apache.user} -g ${apache.group} -T /run/keys/webapps/tools-nextcloud ${varDir}/config/config.php | 207 | install -D -m 0600 -o ${apache.user} -g ${apache.group} -T /var/secrets/webapps/tools-nextcloud ${varDir}/config/config.php |
208 | ''; | 208 | ''; |
209 | }; | 209 | }; |
210 | apache = rec { | 210 | apache = rec { |