Refactor websites

4 files changed, 69 insertions, 185 deletions

diff --git a/modules/private/websites/emilia/moodle.nix b/modules/private/websites/emilia/moodle.nix
new file mode 100644
index 0000000..d49faf5
--- /dev/null
+++ b/modules/private/websites/emilia/moodle.nix
@@ -0,0 +1,69 @@
+{ lib, pkgs, config,  ... }:
+let
+  cfg = config.myServices.websites.emilia.moodle;
+  env = config.myEnv.websites.emilia;
+  varDir = "/var/lib/emilia_moodle";
+  siteDir = ./moodle;
+  webappName = "emilia_moodle";
+  webappdir = config.services.websites.webappDirsPaths.emilia_moodle;
+  # php_admin_value[upload_max_filesize] = 50000000
+  # php_admin_value[post_max_size] = 50000000
+  configFile = ''
+    <?php  // Moodle configuration file
+
+    unset($CFG);
+    global $CFG;
+    $CFG = new stdClass();
+
+    $CFG->dbtype    = 'pgsql';
+    $CFG->dblibrary = 'native';
+    $CFG->dbhost    = '${env.postgresql.host}';
+    $CFG->dbname    = '${env.postgresql.database}';
+    $CFG->dbuser    = '${env.postgresql.user}';
+    $CFG->dbpass    = '${env.postgresql.password}';
+    $CFG->prefix    = 'mdl_';
+    $CFG->dboptions = array (
+      'dbpersist' => 0,
+      'dbport' => '${env.postgreesql.port}',
+      'dbsocket' => '${env.postgresql.password}',
+    );
+
+    $CFG->wwwroot   = 'https://www.saison-photo.org';
+    $CFG->dataroot  = '${varDir}';
+    $CFG->admin     = 'admin';
+
+    $CFG->directorypermissions = 02777;
+
+    require_once(__DIR__ . '/lib/setup.php');
+
+    // There is no php closing tag in this file,
+    // it is intentional because it prevents trailing whitespace problems!
+    '';
+  apacheUser = config.services.httpd.Prod.user;
+  apacheGroup = config.services.httpd.Prod.group;
+in {
+  options.myServices.websites.emilia.moodle.enable = lib.mkEnableOption "enable Emilia's website";
+
+  config = lib.mkIf cfg.enable {
+    services.duplyBackup.profiles.emilia_moodle.rootDir = varDir;
+    system.activationScripts.emilia_moodle = ''
+      install -m 0755 -o ${apacheUser} -g ${apacheGroup} -d ${varDir}
+      '';
+    services.websites.webappDirs.emilia_moodle = siteDir;
+    services.websites.env.production.vhostConfs.emilia_moodle = {
+      certName     = "emilia";
+      certMainHost = "saison-photo.org";
+      hosts        = [ "saison-photo.org" "www.saison-photo.org" ];
+      root         = webappdir;
+      extraConfig  = [
+        ''
+        <Directory ${webappdir}>
+          DirectoryIndex pause.html
+          Options Indexes FollowSymLinks MultiViews Includes
+          Require all granted
+        </Directory>
+          ''
+      ];
+    };
+  };
+}
diff --git a/modules/private/websites/emilia/production.nix b/modules/private/websites/emilia/production.nix
deleted file mode 100644
index 71b97dd..0000000
--- a/modules/private/websites/emilia/production.nix
+++ /dev/null
@@ -1,69 +0,0 @@
-{ lib, pkgs, config,  ... }:
-let
-    cfg = config.myServices.websites.emilia.production;
-    env = config.myEnv.websites.emilia;
-    varDir = "/var/lib/moodle";
-    siteDir = ./moodle;
-    webappName = "emilia_moodle";
-    root = "/run/current-system/webapps/${webappName}";
-    # php_admin_value[upload_max_filesize] = 50000000
-    # php_admin_value[post_max_size] = 50000000
-    configFile = ''
-      <?php  // Moodle configuration file
-
-      unset($CFG);
-      global $CFG;
-      $CFG = new stdClass();
-
-      $CFG->dbtype    = 'pgsql';
-      $CFG->dblibrary = 'native';
-      $CFG->dbhost    = '${env.postgresql.host}';
-      $CFG->dbname    = '${env.postgresql.database}';
-      $CFG->dbuser    = '${env.postgresql.user}';
-      $CFG->dbpass    = '${env.postgresql.password}';
-      $CFG->prefix    = 'mdl_';
-      $CFG->dboptions = array (
-        'dbpersist' => 0,
-        'dbport' => '${env.postgreesql.port}',
-        'dbsocket' => '${env.postgresql.password}',
-      );
-
-      $CFG->wwwroot   = 'https://www.saison-photo.org';
-      $CFG->dataroot  = '${varDir}';
-      $CFG->admin     = 'admin';
-
-      $CFG->directorypermissions = 02777;
-
-      require_once(__DIR__ . '/lib/setup.php');
-
-      // There is no php closing tag in this file,
-      // it is intentional because it prevents trailing whitespace problems!
-      '';
-in {
-  options.myServices.websites.emilia.production.enable = lib.mkEnableOption "enable Emilia's website";
-
-  config = lib.mkIf cfg.enable {
-    services.duplyBackup.profiles.emilia_prod = {
-      rootDir = varDir;
-    };
-    system.activationScripts.emilia = ''
-      install -m 0755 -o wwwrun -g wwwrun -d ${varDir}
-      '';
-    myServices.websites.webappDirs."${webappName}" = siteDir;
-    services.websites.env.production.vhostConfs.emilia = {
-      certName     = "emilia";
-      certMainHost = "saison-photo.org";
-      hosts        = [ "saison-photo.org" "www.saison-photo.org" ];
-      root         = root;
-      extraConfig  = [
-        ''
-        <Directory ${root}>
-          DirectoryIndex pause.html
-          Options Indexes FollowSymLinks MultiViews Includes
-          Require all granted
-        </Directory>
-          ''
-      ];
-    };
-  };
-}
diff --git a/modules/private/websites/emilia/richie.json b/modules/private/websites/emilia/richie.json
deleted file mode 100644
index f51d8c1..0000000
--- a/modules/private/websites/emilia/richie.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "tag": "11490d4-master",
-  "meta": {
-    "name": "richie",
-    "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Richie",
-    "branch": "master"
-  },
-  "git": {
-    "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Richie",
-    "rev": "11490d4591034deca7681aae8d9a22ca6cd8da4a",
-    "sha256": "1rlq5qkbaw9n7yxhyvvimrizwkpqlhhsc8mhipzxlwk1si81fci1",
-    "fetchSubmodules": true
-  }
-}
diff --git a/modules/private/websites/emilia/richie.nix b/modules/private/websites/emilia/richie.nix
deleted file mode 100644
index 98ab1cd..0000000
--- a/modules/private/websites/emilia/richie.nix
+++ /dev/null
@@ -1,102 +0,0 @@
-{ lib, config, pkgs, ... }:
-let
-  cfg = config.myServices.websites.emilia.richie_production;
-  vardir = "/var/lib/richie_production";
-  richieSrc = pkgs.stdenv.mkDerivation (pkgs.mylibs.fetchedGitPrivate ./richie.json // {
-    phases = "installPhase";
-    installPhase = ''
-      cp -a $src $out
-      chmod -R u+w $out
-      ln -sf ${vardir}/files $out/
-      ln -sf ${vardir}/drapeaux $out/images/
-      ln -sf ${vardir}/photos $out/
-      sed -i "s@localedef --list-archive@localedef --list-archive /run/current-system/sw/lib/locale/locale-archive@" $out/admin/parametres.php
-      '';
-  });
-in
-{
-  options.myServices.websites.emilia.richie_production.enable = lib.mkEnableOption "enable Richie's website";
-  config = lib.mkIf cfg.enable {
-    services.duplyBackup.profiles.richie_production.rootDir = vardir;
-    services.webstats.sites = [ { name = "europe-richie.org"; } ];
-
-    secrets.keys = [{
-      dest = "webapps/prod-richie";
-      user = "wwwrun";
-      group = "wwwrun";
-      permissions = "0400";
-      text = with config.myEnv.websites.richie; ''
-        <?php
-
-        $hote_sql = '${mysql.host}';
-        $login_sql = '${mysql.user}';
-        $bdd_sql = '${mysql.database}';
-        $mdp_sql = '${mysql.password}';
-
-        $db = mysqli_connect($hote_sql,$login_sql,$mdp_sql);
-        unset($mdp_sql);
-
-        $smtp_mailer->Auth('${smtp_mailer.user}', '${smtp_mailer.password}');
-        ?>
-        '';
-    }];
-    myServices.websites.webappDirs.richie_production = richieSrc;
-    system.activationScripts.richie_production = {
-      deps = [ "httpd" ];
-      text = ''
-        install -m 0755 -o wwwrun -g wwwrun -d /var/lib/php/sessions/richie_production
-        install -m 0755 -o wwwrun -g wwwrun -d ${vardir}
-        '';
-    };
-    services.phpfpm.pools.richie_production = {
-      user = "wwwrun";
-      group = "wwwrun";
-      settings = {
-        "listen.owner" = "wwwrun";
-        "listen.group" = "wwwrun";
-
-        "pm" = "ondemand";
-        "pm.max_children" = "5";
-        "pm.process_idle_timeout" = "60";
-
-        "php_admin_value[open_basedir]" = "${vardir}:/var/lib/php/sessions/richie_production:/var/secrets/webapps/prod-richie:${richieSrc}:/tmp";
-        "php_admin_value[session.save_path]" = "/var/lib/php/sessions/richie_production";
-      };
-      phpEnv = {
-        PATH = "/run/current-system/sw/bin:${lib.makeBinPath [ pkgs.imagemagick ]}";
-        BDD_CONNECT = "/var/secrets/webapps/prod-richie";
-      };
-      phpOptions = config.services.phpfpm.phpOptions + ''
-        date.timezone = 'Europe/Paris'
-        extension=${pkgs.php}/lib/php/extensions/mysqli.so
-        '';
-    };
-    services.websites.env.production.modules = [ "proxy_fcgi" ];
-    services.websites.env.production.vhostConfs.richie_production = {
-      certName    = "richie";
-      addToCerts  = true;
-      certMainHost = "europe-richie.org";
-      hosts       = [ "europe-richie.org" "www.europe-richie.org" ];
-      root        = "/run/current-system/webapps/richie_production";
-      extraConfig = [
-        ''
-        Use Stats europe-richie.org
-        ErrorDocument 404 /404.html
-        <LocationMatch "^/files/.*/admin/">
-          Require all denied
-        </LocationMatch>
-        <Directory /run/current-system/webapps/richie_production>
-          DirectoryIndex index.php index.htm index.html
-          Options Indexes FollowSymLinks MultiViews Includes
-          AllowOverride None
-          Require all granted
-
-          <FilesMatch "\.php$">
-            SetHandler "proxy:unix:${config.services.phpfpm.pools.richie_production.socket}|fcgi://localhost"
-          </FilesMatch>
-        </Directory>
-          ''
-      ];
-    };
-  };
-}