diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-04-25 09:05:46 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-04-25 09:05:46 +0200 |
commit | 32c84ff89c2b8931f58cea63961a178a9b1d0efe (patch) | |
tree | 7a90c28e1db3d8c704b2371737f2f2fae471db67 /nixops/modules/task | |
parent | 742697c95318d3625298437995e948ee00a00ba5 (diff) | |
download | Nix-32c84ff89c2b8931f58cea63961a178a9b1d0efe.tar.gz Nix-32c84ff89c2b8931f58cea63961a178a9b1d0efe.tar.zst Nix-32c84ff89c2b8931f58cea63961a178a9b1d0efe.zip |
Move etherpad mastodon mediagoblin task and peertube to new secrets
Diffstat (limited to 'nixops/modules/task')
-rw-r--r-- | nixops/modules/task/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nixops/modules/task/default.nix b/nixops/modules/task/default.nix index 2001eaa..9671725 100644 --- a/nixops/modules/task/default.nix +++ b/nixops/modules/task/default.nix | |||
@@ -87,8 +87,8 @@ in { | |||
87 | }; | 87 | }; |
88 | 88 | ||
89 | config = lib.mkIf cfg.enable { | 89 | config = lib.mkIf cfg.enable { |
90 | deployment.keys.tools-taskwarrior-web = { | 90 | mySecrets.keys = [{ |
91 | destDir = "/run/keys/webapps"; | 91 | dest = "webapps/tools-taskwarrior-web"; |
92 | user = "wwwrun"; | 92 | user = "wwwrun"; |
93 | group = "wwwrun"; | 93 | group = "wwwrun"; |
94 | permissions = "0400"; | 94 | permissions = "0400"; |
@@ -101,7 +101,7 @@ in { | |||
101 | SetEnv TASKD_LDAP_BASE "${env.ldap.base}" | 101 | SetEnv TASKD_LDAP_BASE "${env.ldap.base}" |
102 | SetEnv TASKD_LDAP_FILTER "${env.ldap.search}" | 102 | SetEnv TASKD_LDAP_FILTER "${env.ldap.search}" |
103 | ''; | 103 | ''; |
104 | }; | 104 | }]; |
105 | security.acme.certs."eldiron".extraDomains.${fqdn} = null; | 105 | security.acme.certs."eldiron".extraDomains.${fqdn} = null; |
106 | services.myWebsites.tools.modules = [ "proxy_fcgi" "sed" ]; | 106 | services.myWebsites.tools.modules = [ "proxy_fcgi" "sed" ]; |
107 | services.myWebsites.tools.vhostConfs.task = { | 107 | services.myWebsites.tools.vhostConfs.task = { |
@@ -116,7 +116,7 @@ in { | |||
116 | <FilesMatch "\.php$"> | 116 | <FilesMatch "\.php$"> |
117 | SetHandler "proxy:unix:/var/run/phpfpm/task.sock|fcgi://localhost" | 117 | SetHandler "proxy:unix:/var/run/phpfpm/task.sock|fcgi://localhost" |
118 | </FilesMatch> | 118 | </FilesMatch> |
119 | Include /run/keys/webapps/tools-taskwarrior-web | 119 | Include /var/secrets/webapps/tools-taskwarrior-web |
120 | </Directory> | 120 | </Directory> |
121 | '' | 121 | '' |
122 | '' | 122 | '' |