diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-02-09 02:22:14 +0100 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-02-09 02:22:14 +0100 |
commit | 1922655a53a11307fc07f6bbcdfec68c1f2a8b33 (patch) | |
tree | b749ab3b578d8cd03a153878b3718d01b2c7ce1e /nixops/modules | |
parent | b892dcbeee4319885dc8371977046c9aabfed7e4 (diff) | |
download | Nix-1922655a53a11307fc07f6bbcdfec68c1f2a8b33.tar.gz Nix-1922655a53a11307fc07f6bbcdfec68c1f2a8b33.tar.zst Nix-1922655a53a11307fc07f6bbcdfec68c1f2a8b33.zip |
Add other tools
Diffstat (limited to 'nixops/modules')
-rw-r--r-- | nixops/modules/websites/tools/tools/default.nix | 30 |
1 files changed, 28 insertions, 2 deletions
diff --git a/nixops/modules/websites/tools/tools/default.nix b/nixops/modules/websites/tools/tools/default.nix index 0b50a7c..4bbd5cd 100644 --- a/nixops/modules/websites/tools/tools/default.nix +++ b/nixops/modules/websites/tools/tools/default.nix | |||
@@ -35,7 +35,8 @@ in { | |||
35 | security.acme.certs."eldiron".extraDomains."tools.immae.eu" = null; | 35 | security.acme.certs."eldiron".extraDomains."tools.immae.eu" = null; |
36 | 36 | ||
37 | services.myWebsites.tools.modules = | 37 | services.myWebsites.tools.modules = |
38 | adminer.apache.modules | 38 | [ "proxy_fcgi" ] |
39 | ++ adminer.apache.modules | ||
39 | ++ ympd.apache.modules | 40 | ++ ympd.apache.modules |
40 | ++ ttrss.apache.modules | 41 | ++ ttrss.apache.modules |
41 | ++ roundcubemail.apache.modules | 42 | ++ roundcubemail.apache.modules |
@@ -50,8 +51,17 @@ in { | |||
50 | services.myWebsites.tools.vhostConfs.tools = { | 51 | services.myWebsites.tools.vhostConfs.tools = { |
51 | certName = "eldiron"; | 52 | certName = "eldiron"; |
52 | hosts = ["tools.immae.eu" ]; | 53 | hosts = ["tools.immae.eu" ]; |
53 | root = null; | 54 | root = "/var/lib/ftp/tools.immae.eu"; |
54 | extraConfig = [ | 55 | extraConfig = [ |
56 | '' | ||
57 | <Directory "/var/lib/ftp/tools.immae.eu"> | ||
58 | AllowOverride all | ||
59 | Require all granted | ||
60 | <FilesMatch "\.php$"> | ||
61 | SetHandler "proxy:unix:/var/run/phpfpm/tools.sock|fcgi://localhost" | ||
62 | </FilesMatch> | ||
63 | </Directory> | ||
64 | '' | ||
55 | adminer.apache.vhostConf | 65 | adminer.apache.vhostConf |
56 | ympd.apache.vhostConf | 66 | ympd.apache.vhostConf |
57 | ttrss.apache.vhostConf | 67 | ttrss.apache.vhostConf |
@@ -73,6 +83,22 @@ in { | |||
73 | rompr = rompr.phpFpm.pool; | 83 | rompr = rompr.phpFpm.pool; |
74 | shaarli = shaarli.phpFpm.pool; | 84 | shaarli = shaarli.phpFpm.pool; |
75 | dokuwiki = dokuwiki.phpFpm.pool; | 85 | dokuwiki = dokuwiki.phpFpm.pool; |
86 | tools = '' | ||
87 | listen = /var/run/phpfpm/tools.sock | ||
88 | user = wwwrun | ||
89 | group = wwwrun | ||
90 | listen.owner = wwwrun | ||
91 | listen.group = wwwrun | ||
92 | pm = dynamic | ||
93 | pm.max_children = 60 | ||
94 | pm.start_servers = 2 | ||
95 | pm.min_spare_servers = 1 | ||
96 | pm.max_spare_servers = 10 | ||
97 | |||
98 | ; Needed to avoid clashes in browser cookies (same domain) | ||
99 | php_value[session.name] = ToolsPHPSESSID | ||
100 | php_admin_value[open_basedir] = "/run/wrappers/bin/sendmail:/var/lib/ftp/tools.immae.eu:/tmp" | ||
101 | ''; | ||
76 | }; | 102 | }; |
77 | 103 | ||
78 | system.activationScripts = { | 104 | system.activationScripts = { |