X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Fimmae%2Fproduction.nix;h=87bb848d7ddd044e578469158fa56890baa34b66;hb=8cf37c75c3c744717327344ff982a62d787c1dc7;hp=58cf04889587e401e6442e1ef5eb1dd8eabb19b0;hpb=f8026b6e4c869aa108f6361c8ccd50890657994d;p=perso%2FImmae%2FConfig%2FNix.git
diff --git a/modules/private/websites/immae/production.nix b/modules/private/websites/immae/production.nix
index 58cf048..87bb848 100644
--- a/modules/private/websites/immae/production.nix
+++ b/modules/private/websites/immae/production.nix
@@ -1,29 +1,17 @@
-{ lib, pkgs, config, myconfig, ... }:
+{ lib, pkgs, config, ... }:
let
cfg = config.myServices.websites.immae.production;
- varDir = "/var/lib/ftp/immae";
- env = myconfig.env.websites.immae;
+ varDir = "/var/lib/buildbot/outputs/immaeEu";
+ coursDir = "/var/lib/buildbot/outputs/cours";
+ rechercheDir = "/var/lib/buildbot/outputs/recherche";
+ env = config.myEnv.websites.immae;
in {
options.myServices.websites.immae.production.enable = lib.mkEnableOption "enable Immae's website";
config = lib.mkIf cfg.enable {
services.webstats.sites = [ { name = "www.immae.eu"; } ];
- services.myPhpfpm.poolConfigs.immae = ''
- listen = /run/phpfpm/immae.sock
- user = wwwrun
- group = wwwrun
- listen.owner = wwwrun
- listen.group = wwwrun
-
- pm = ondemand
- pm.max_children = 5
- pm.process_idle_timeout = 60
-
- php_admin_value[open_basedir] = "${varDir}:/tmp"
- '';
- services.websites.production.modules = [ "proxy_fcgi" ];
- services.websites.production.vhostConfs.immae = {
+ services.websites.env.production.vhostConfs.immae = {
certName = "eldiron";
addToCerts = true;
hosts = [ "www.immae.eu" ];
@@ -32,26 +20,43 @@ in {
''
Use Stats www.immae.eu
-
- SetHandler "proxy:unix:/run/phpfpm/immae.sock|fcgi://localhost"
-
-
- DirectoryIndex index.php index.htm index.html
+ DirectoryIndex index.htm index.html
+ Options Indexes FollowSymLinks MultiViews Includes
+ AllowOverride All
+ Require all granted
+
+
+ Alias /cours ${coursDir}
+
+ DirectoryIndex index.htm index.html
Options Indexes FollowSymLinks MultiViews Includes
AllowOverride All
Require all granted
-
- Use LDAPConnect
- Require ldap-group cn=blog,cn=immae.eu,ou=services,dc=immae,dc=eu
-
+ Alias /recherche ${rechercheDir}
+
+ DirectoryIndex index.htm index.html
+ Options Indexes FollowSymLinks MultiViews Includes
+ AllowOverride All
+ Require all granted
+
''
];
};
- services.websites.production.vhostConfs.bouya = {
+ services.websites.env.production.vhostConfs.immaeFr = {
+ certName = "eldiron";
+ addToCerts = true;
+ hosts = [ "www.immae.fr" "immae.fr" ];
+ root = null;
+ extraConfig = [ ''
+ RedirectMatch 301 ^/((?!\.well-known.*$).*)$ https://www.immae.eu/chapeaux/
+ '' ];
+ };
+
+ services.websites.env.production.vhostConfs.bouya = {
certName = "eldiron";
addToCerts = true;
hosts = [ "bouya.org" "www.bouya.org" ];