diff options
Diffstat (limited to 'modules/private/websites/tools/tools/default.nix')
-rw-r--r-- | modules/private/websites/tools/tools/default.nix | 35 |
1 files changed, 4 insertions, 31 deletions
diff --git a/modules/private/websites/tools/tools/default.nix b/modules/private/websites/tools/tools/default.nix index 9908d99..5b368e0 100644 --- a/modules/private/websites/tools/tools/default.nix +++ b/modules/private/websites/tools/tools/default.nix | |||
@@ -10,11 +10,6 @@ let | |||
10 | inherit (pkgs.webapps) ttrss ttrss-plugins; | 10 | inherit (pkgs.webapps) ttrss ttrss-plugins; |
11 | env = myconfig.env.tools.ttrss; | 11 | env = myconfig.env.tools.ttrss; |
12 | }; | 12 | }; |
13 | roundcubemail = pkgs.callPackage ./roundcubemail.nix { | ||
14 | inherit (pkgs.webapps) roundcubemail roundcubemail-plugins roundcubemail-skins; | ||
15 | env = myconfig.env.tools.roundcubemail; | ||
16 | }; | ||
17 | rainloop = pkgs.callPackage ./rainloop.nix {}; | ||
18 | kanboard = pkgs.callPackage ./kanboard.nix { | 13 | kanboard = pkgs.callPackage ./kanboard.nix { |
19 | env = myconfig.env.tools.kanboard; | 14 | env = myconfig.env.tools.kanboard; |
20 | }; | 15 | }; |
@@ -51,21 +46,16 @@ in { | |||
51 | secrets.keys = | 46 | secrets.keys = |
52 | kanboard.keys | 47 | kanboard.keys |
53 | ++ ldap.keys | 48 | ++ ldap.keys |
54 | ++ roundcubemail.keys | ||
55 | ++ shaarli.keys | 49 | ++ shaarli.keys |
56 | ++ ttrss.keys | 50 | ++ ttrss.keys |
57 | ++ wallabag.keys | 51 | ++ wallabag.keys |
58 | ++ yourls.keys; | 52 | ++ yourls.keys; |
59 | 53 | ||
60 | services.websites.env.integration.modules = | ||
61 | rainloop.apache.modules; | ||
62 | |||
63 | services.websites.env.tools.modules = | 54 | services.websites.env.tools.modules = |
64 | [ "proxy_fcgi" ] | 55 | [ "proxy_fcgi" ] |
65 | ++ adminer.apache.modules | 56 | ++ adminer.apache.modules |
66 | ++ ympd.apache.modules | 57 | ++ ympd.apache.modules |
67 | ++ ttrss.apache.modules | 58 | ++ ttrss.apache.modules |
68 | ++ roundcubemail.apache.modules | ||
69 | ++ wallabag.apache.modules | 59 | ++ wallabag.apache.modules |
70 | ++ yourls.apache.modules | 60 | ++ yourls.apache.modules |
71 | ++ rompr.apache.modules | 61 | ++ rompr.apache.modules |
@@ -90,7 +80,6 @@ in { | |||
90 | </FilesMatch> | 80 | </FilesMatch> |
91 | </Directory> | 81 | </Directory> |
92 | '' | 82 | '' |
93 | rainloop.apache.vhostConf | ||
94 | ]; | 83 | ]; |
95 | }; | 84 | }; |
96 | 85 | ||
@@ -101,6 +90,8 @@ in { | |||
101 | root = "/var/lib/ftp/tools.immae.eu"; | 90 | root = "/var/lib/ftp/tools.immae.eu"; |
102 | extraConfig = [ | 91 | extraConfig = [ |
103 | '' | 92 | '' |
93 | RedirectMatch 301 ^/roundcube(.*)$ https://mail.immae.eu/roundcube$1 | ||
94 | |||
104 | <Directory "/var/lib/ftp/tools.immae.eu"> | 95 | <Directory "/var/lib/ftp/tools.immae.eu"> |
105 | DirectoryIndex index.php index.htm index.html | 96 | DirectoryIndex index.php index.htm index.html |
106 | AllowOverride all | 97 | AllowOverride all |
@@ -113,7 +104,6 @@ in { | |||
113 | adminer.apache.vhostConf | 104 | adminer.apache.vhostConf |
114 | ympd.apache.vhostConf | 105 | ympd.apache.vhostConf |
115 | ttrss.apache.vhostConf | 106 | ttrss.apache.vhostConf |
116 | roundcubemail.apache.vhostConf | ||
117 | wallabag.apache.vhostConf | 107 | wallabag.apache.vhostConf |
118 | yourls.apache.vhostConf | 108 | yourls.apache.vhostConf |
119 | rompr.apache.vhostConf | 109 | rompr.apache.vhostConf |
@@ -145,6 +135,8 @@ in { | |||
145 | 135 | ||
146 | RedirectMatch 301 ^/taskweb(.*)$ https://task.immae.eu/taskweb$1 | 136 | RedirectMatch 301 ^/taskweb(.*)$ https://task.immae.eu/taskweb$1 |
147 | 137 | ||
138 | RedirectMatch 301 ^/roundcube(.*)$ https://mail.immae.eu/roundcube$1 | ||
139 | |||
148 | RedirectMatch 301 ^/(.*)$ https://tools.immae.eu/$1 | 140 | RedirectMatch 301 ^/(.*)$ https://tools.immae.eu/$1 |
149 | '' | 141 | '' |
150 | ]; | 142 | ]; |
@@ -163,14 +155,6 @@ in { | |||
163 | after = lib.mkAfter ldap.phpFpm.serviceDeps; | 155 | after = lib.mkAfter ldap.phpFpm.serviceDeps; |
164 | wants = ldap.phpFpm.serviceDeps; | 156 | wants = ldap.phpFpm.serviceDeps; |
165 | }; | 157 | }; |
166 | phpfpm-rainloop = { | ||
167 | after = lib.mkAfter rainloop.phpFpm.serviceDeps; | ||
168 | wants = rainloop.phpFpm.serviceDeps; | ||
169 | }; | ||
170 | phpfpm-roundcubemail = { | ||
171 | after = lib.mkAfter roundcubemail.phpFpm.serviceDeps; | ||
172 | wants = roundcubemail.phpFpm.serviceDeps; | ||
173 | }; | ||
174 | phpfpm-shaarli = { | 158 | phpfpm-shaarli = { |
175 | after = lib.mkAfter shaarli.phpFpm.serviceDeps; | 159 | after = lib.mkAfter shaarli.phpFpm.serviceDeps; |
176 | wants = shaarli.phpFpm.serviceDeps; | 160 | wants = shaarli.phpFpm.serviceDeps; |
@@ -217,12 +201,6 @@ in { | |||
217 | paths = [ "/var/secrets/mpd" ]; | 201 | paths = [ "/var/secrets/mpd" ]; |
218 | }; | 202 | }; |
219 | 203 | ||
220 | services.phpfpm.pools.roundcubemail = { | ||
221 | listen = roundcubemail.phpFpm.socket; | ||
222 | extraConfig = roundcubemail.phpFpm.pool; | ||
223 | phpOptions = config.services.phpfpm.phpOptions + roundcubemail.phpFpm.phpConfig; | ||
224 | }; | ||
225 | |||
226 | services.phpfpm.pools.devtools = { | 204 | services.phpfpm.pools.devtools = { |
227 | listen = "/var/run/phpfpm/devtools.sock"; | 205 | listen = "/var/run/phpfpm/devtools.sock"; |
228 | extraConfig = '' | 206 | extraConfig = '' |
@@ -254,7 +232,6 @@ in { | |||
254 | shaarli = shaarli.phpFpm.pool; | 232 | shaarli = shaarli.phpFpm.pool; |
255 | dokuwiki = dokuwiki.phpFpm.pool; | 233 | dokuwiki = dokuwiki.phpFpm.pool; |
256 | ldap = ldap.phpFpm.pool; | 234 | ldap = ldap.phpFpm.pool; |
257 | rainloop = rainloop.phpFpm.pool; | ||
258 | kanboard = kanboard.phpFpm.pool; | 235 | kanboard = kanboard.phpFpm.pool; |
259 | tools = '' | 236 | tools = '' |
260 | listen = /var/run/phpfpm/tools.sock | 237 | listen = /var/run/phpfpm/tools.sock |
@@ -277,13 +254,11 @@ in { | |||
277 | system.activationScripts = { | 254 | system.activationScripts = { |
278 | adminer = adminer.activationScript; | 255 | adminer = adminer.activationScript; |
279 | ttrss = ttrss.activationScript; | 256 | ttrss = ttrss.activationScript; |
280 | roundcubemail = roundcubemail.activationScript; | ||
281 | wallabag = wallabag.activationScript; | 257 | wallabag = wallabag.activationScript; |
282 | yourls = yourls.activationScript; | 258 | yourls = yourls.activationScript; |
283 | rompr = rompr.activationScript; | 259 | rompr = rompr.activationScript; |
284 | shaarli = shaarli.activationScript; | 260 | shaarli = shaarli.activationScript; |
285 | dokuwiki = dokuwiki.activationScript; | 261 | dokuwiki = dokuwiki.activationScript; |
286 | rainloop = rainloop.activationScript; | ||
287 | kanboard = kanboard.activationScript; | 262 | kanboard = kanboard.activationScript; |
288 | ldap = ldap.activationScript; | 263 | ldap = ldap.activationScript; |
289 | }; | 264 | }; |
@@ -293,12 +268,10 @@ in { | |||
293 | "${dokuwiki.apache.webappName}" = dokuwiki.webRoot; | 268 | "${dokuwiki.apache.webappName}" = dokuwiki.webRoot; |
294 | "${ldap.apache.webappName}" = "${ldap.webRoot}/htdocs"; | 269 | "${ldap.apache.webappName}" = "${ldap.webRoot}/htdocs"; |
295 | "${rompr.apache.webappName}" = rompr.webRoot; | 270 | "${rompr.apache.webappName}" = rompr.webRoot; |
296 | "${roundcubemail.apache.webappName}" = roundcubemail.webRoot; | ||
297 | "${shaarli.apache.webappName}" = shaarli.webRoot; | 271 | "${shaarli.apache.webappName}" = shaarli.webRoot; |
298 | "${ttrss.apache.webappName}" = ttrss.webRoot; | 272 | "${ttrss.apache.webappName}" = ttrss.webRoot; |
299 | "${wallabag.apache.webappName}" = wallabag.webRoot; | 273 | "${wallabag.apache.webappName}" = wallabag.webRoot; |
300 | "${yourls.apache.webappName}" = yourls.webRoot; | 274 | "${yourls.apache.webappName}" = yourls.webRoot; |
301 | "${rainloop.apache.webappName}" = rainloop.webRoot; | ||
302 | "${kanboard.apache.webappName}" = kanboard.webRoot; | 275 | "${kanboard.apache.webappName}" = kanboard.webRoot; |
303 | }; | 276 | }; |
304 | 277 | ||