diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-04-26 03:04:56 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-04-26 03:04:56 +0200 |
commit | 7df5e532c1ce2ab9e8527615c08c1178990870e6 (patch) | |
tree | 3790f2afe0be38e37ba82305a1139db6c6b61c79 /modules/private/websites/tools/tools/default.nix | |
parent | a8ef1adb4a90c2524ac09a85463598e5d41d2a4a (diff) | |
download | Nix-7df5e532c1ce2ab9e8527615c08c1178990870e6.tar.gz Nix-7df5e532c1ce2ab9e8527615c08c1178990870e6.tar.zst Nix-7df5e532c1ce2ab9e8527615c08c1178990870e6.zip |
Add dmarc reports
Diffstat (limited to 'modules/private/websites/tools/tools/default.nix')
-rw-r--r-- | modules/private/websites/tools/tools/default.nix | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/modules/private/websites/tools/tools/default.nix b/modules/private/websites/tools/tools/default.nix index 0cb7a10..a5e7f2e 100644 --- a/modules/private/websites/tools/tools/default.nix +++ b/modules/private/websites/tools/tools/default.nix | |||
@@ -47,6 +47,9 @@ let | |||
47 | webhooks = pkgs.callPackage ./webhooks.nix { | 47 | webhooks = pkgs.callPackage ./webhooks.nix { |
48 | env = config.myEnv.tools.webhooks; | 48 | env = config.myEnv.tools.webhooks; |
49 | }; | 49 | }; |
50 | dmarc-reports = pkgs.callPackage ./dmarc_reports.nix { | ||
51 | env = config.myEnv.tools.dmarc_reports; | ||
52 | }; | ||
50 | 53 | ||
51 | landing = pkgs.callPackage ./landing.nix {}; | 54 | landing = pkgs.callPackage ./landing.nix {}; |
52 | 55 | ||
@@ -65,6 +68,7 @@ in { | |||
65 | ++ ttrss.keys | 68 | ++ ttrss.keys |
66 | ++ wallabag.keys | 69 | ++ wallabag.keys |
67 | ++ yourls.keys | 70 | ++ yourls.keys |
71 | ++ dmarc-reports.keys | ||
68 | ++ webhooks.keys; | 72 | ++ webhooks.keys; |
69 | 73 | ||
70 | services.duplyBackup.profiles = { | 74 | services.duplyBackup.profiles = { |
@@ -88,6 +92,7 @@ in { | |||
88 | ++ rompr.apache.modules | 92 | ++ rompr.apache.modules |
89 | ++ shaarli.apache.modules | 93 | ++ shaarli.apache.modules |
90 | ++ dokuwiki.apache.modules | 94 | ++ dokuwiki.apache.modules |
95 | ++ dmarc-reports.apache.modules | ||
91 | ++ phpbb.apache.modules | 96 | ++ phpbb.apache.modules |
92 | ++ ldap.apache.modules | 97 | ++ ldap.apache.modules |
93 | ++ kanboard.apache.modules; | 98 | ++ kanboard.apache.modules; |
@@ -147,6 +152,7 @@ in { | |||
147 | (kanboard.apache.vhostConf pcfg.kanboard.socket) | 152 | (kanboard.apache.vhostConf pcfg.kanboard.socket) |
148 | (grocy.apache.vhostConf pcfg.grocy.socket) | 153 | (grocy.apache.vhostConf pcfg.grocy.socket) |
149 | (phpbb.apache.vhostConf pcfg.phpbb.socket) | 154 | (phpbb.apache.vhostConf pcfg.phpbb.socket) |
155 | (dmarc-reports.apache.vhostConf pcfg.dmarc-reports.socket) | ||
150 | '' | 156 | '' |
151 | Alias /paste /var/lib/fiche | 157 | Alias /paste /var/lib/fiche |
152 | <Directory "/var/lib/fiche"> | 158 | <Directory "/var/lib/fiche"> |
@@ -342,6 +348,15 @@ in { | |||
342 | group = "wwwrun"; | 348 | group = "wwwrun"; |
343 | settings = shaarli.phpFpm.pool; | 349 | settings = shaarli.phpFpm.pool; |
344 | }; | 350 | }; |
351 | dmarc-reports = { | ||
352 | user = "wwwrun"; | ||
353 | group = "wwwrun"; | ||
354 | settings = dmarc-reports.phpFpm.pool; | ||
355 | phpEnv = dmarc-reports.phpFpm.phpEnv; | ||
356 | phpOptions = config.services.phpfpm.phpOptions + '' | ||
357 | extension=${pkgs.php}/lib/php/extensions/mysqli.so | ||
358 | ''; | ||
359 | }; | ||
345 | dokuwiki = { | 360 | dokuwiki = { |
346 | user = "wwwrun"; | 361 | user = "wwwrun"; |
347 | group = "wwwrun"; | 362 | group = "wwwrun"; |
@@ -386,6 +401,7 @@ in { | |||
386 | 401 | ||
387 | services.websites.webappDirs = { | 402 | services.websites.webappDirs = { |
388 | _adminer = adminer.webRoot; | 403 | _adminer = adminer.webRoot; |
404 | "${dmarc-reports.apache.webappName}" = dmarc-reports.webRoot; | ||
389 | "${dokuwiki.apache.webappName}" = dokuwiki.webRoot; | 405 | "${dokuwiki.apache.webappName}" = dokuwiki.webRoot; |
390 | "${phpbb.apache.webappName}" = phpbb.webRoot; | 406 | "${phpbb.apache.webappName}" = phpbb.webRoot; |
391 | "${ldap.apache.webappName}" = "${ldap.webRoot}/htdocs"; | 407 | "${ldap.apache.webappName}" = "${ldap.webRoot}/htdocs"; |