Move ympd password to secure location

[perso/Immae/Config/Nix.git] / nixops / modules / websites / tools / tools / default.nix

diff --git a/nixops/modules/websites/tools/tools/default.nix b/nixops/modules/websites/tools/tools/default.nix
index 8edbdd9aa13b56a38350737ac8892d16d4f6bcc3..fc5b48d29b3b43cc1748ac6355806065093bb689 100644 (file)
--- a/nixops/modules/websites/tools/tools/default.nix
+++ b/nixops/modules/websites/tools/tools/default.nix
@@ -46,6 +46,15 @@ in {
     security.acme.certs."eldiron".extraDomains."tools.immae.eu" = null;
     security.acme.certs."eldiron".extraDomains."devtools.immae.eu" = null;
 
+    deployment.keys =
+      kanboard.keys
+      // ldap.keys
+      // roundcubemail.keys
+      // shaarli.keys
+      // ttrss.keys
+      // wallabag.keys
+      // yourls.keys;
+
     services.myWebsites.integration.modules =
       rainloop.apache.modules;
 
@@ -63,13 +72,30 @@ in {
       ++ ldap.apache.modules
       ++ kanboard.apache.modules;
 
-    services.ympd = ympd.config // { enable = true; };
+    systemd.services.ympd = {
+      description = "Standalone MPD Web GUI written in C";
+      wantedBy = [ "multi-user.target" ];
+      script = ''
+        export MPD_PASSWORD=$(cat /run/keys/mpd)
+        ${pkgs.ympd}/bin/ympd --host ${ympd.config.host} --port ${toString ympd.config.port} --webport ${ympd.config.webPort} --user nobody
+        '';
+    };
 
     services.myWebsites.integration.vhostConfs.devtools = {
       certName    = "eldiron";
       hosts       = ["devtools.immae.eu" ];
-      root        = null;
+      root        = "/var/lib/ftp/devtools.immae.eu";
       extraConfig = [
+        ''
+          <Directory "/var/lib/ftp/devtools.immae.eu">
+            DirectoryIndex index.php index.htm index.html
+            AllowOverride all
+            Require all granted
+            <FilesMatch "\.php$">
+              SetHandler "proxy:unix:/var/run/phpfpm/devtools.sock|fcgi://localhost"
+            </FilesMatch>
+          </Directory>
+          ''
         rainloop.apache.vhostConf
       ];
     };
@@ -129,6 +155,26 @@ in {
       ];
     };
 
+    services.myPhpfpm.serviceDependencies = {
+      dokuwiki = dokuwiki.phpFpm.serviceDeps;
+      kanboard = kanboard.phpFpm.serviceDeps;
+      ldap = ldap.phpFpm.serviceDeps;
+      rainloop = rainloop.phpFpm.serviceDeps;
+      roundcubemail = roundcubemail.phpFpm.serviceDeps;
+      shaarli = shaarli.phpFpm.serviceDeps;
+      ttrss = ttrss.phpFpm.serviceDeps;
+      wallabag = wallabag.phpFpm.serviceDeps;
+      yourls = yourls.phpFpm.serviceDeps;
+    };
+
+    services.myPhpfpm.poolPhpConfigs = {
+      devtools = ''
+        extension=${pkgs.phpPackages.redis}/lib/php/extensions/redis.so
+        extension=${pkgs.phpPackages.apcu}/lib/php/extensions/apcu.so
+        zend_extension=${pkgs.php}/lib/php/extensions/opcache.so
+        '';
+      roundcubemail = roundcubemail.phpFpm.phpConfig;
+    };
     services.myPhpfpm.poolConfigs = {
       adminer = adminer.phpFpm.pool;
       ttrss = ttrss.phpFpm.pool;
@@ -141,6 +187,20 @@ in {
       ldap = ldap.phpFpm.pool;
       rainloop = rainloop.phpFpm.pool;
       kanboard = kanboard.phpFpm.pool;
+      devtools = ''
+        listen = /var/run/phpfpm/devtools.sock
+        user = wwwrun
+        group = wwwrun
+        listen.owner = wwwrun
+        listen.group = wwwrun
+        pm = dynamic
+        pm.max_children = 60
+        pm.start_servers = 2
+        pm.min_spare_servers = 1
+        pm.max_spare_servers = 10
+
+        php_admin_value[open_basedir] = "/run/wrappers/bin/sendmail:/var/lib/ftp/devtools.immae.eu:/tmp"
+        '';
       tools = ''
         listen = /var/run/phpfpm/tools.sock
         user = wwwrun
@@ -186,7 +246,9 @@ in {
       '';
 
     nixpkgs.overlays = [ (self: super: rec {
-      ympd = super.ympd.overrideAttrs(old: mylibs.fetchedGithub ./ympd.json);
+      ympd = super.ympd.overrideAttrs(old: mylibs.fetchedGithub ./ympd.json // {
+        patches = (old.patches or []) ++ [ ./ympd-password-env.patch ];
+      });
     }) ];
 
     systemd.services.tt-rss = {