X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Fimmae%2Fproduction.nix;h=ae4abe0a1157244ca60e6aa0692ce88749f7e0d6;hb=7130402cfecc196ce79c8f07a9dba71974f085e3;hp=3d76b8611c77dd3626bd5aee4fe8c3a2c118b725;hpb=6da0830ee38b68f3edc020792d446d166c0642a0;p=perso%2FImmae%2FConfig%2FNix.git
diff --git a/modules/private/websites/immae/production.nix b/modules/private/websites/immae/production.nix
index 3d76b86..ae4abe0 100644
--- a/modules/private/websites/immae/production.nix
+++ b/modules/private/websites/immae/production.nix
@@ -4,6 +4,8 @@ let
varDir = "/var/lib/buildbot/outputs/immaeEu";
coursDir = "/var/lib/buildbot/outputs/cours";
rechercheDir = "/var/lib/buildbot/outputs/recherche";
+ recettesDir = "/var/lib/buildbot/outputs/recettes";
+ historyDir = pkgs.callPackage ./history {};
env = config.myEnv.websites.immae;
in {
options.myServices.websites.immae.production.enable = lib.mkEnableOption "enable Immae's website";
@@ -11,12 +13,13 @@ in {
config = lib.mkIf cfg.enable {
services.webstats.sites = [ { name = "www.immae.eu"; } ];
- services.websites.env.production.vhostConfs.immae = {
- certName = "eldiron";
- addToCerts = true;
- hosts = [ "www.immae.eu" "immae.eu" ];
- root = varDir;
- extraConfig = [
+ services.websites.env.production.vhostConfs.immae_production = {
+ certName = "immae";
+ addToCerts = true;
+ certMainHost = "www.immae.eu";
+ hosts = [ "www.immae.eu" "immae.eu" ];
+ root = varDir;
+ extraConfig = [
''
Use Stats www.immae.eu
@@ -55,12 +58,27 @@ in {
AllowOverride All
Require all granted
+
+ Alias /recettes ${recettesDir}
+
+ DirectoryIndex index.htm index.html
+ Options Indexes FollowSymLinks MultiViews Includes
+ AllowOverride All
+ Require all granted
+
+
+ Alias /history ${historyDir}
+
+ DirectoryIndex index.html
+ AllowOverride None
+ Require all granted
+
''
];
};
- services.websites.env.production.vhostConfs.immaeFr = {
- certName = "eldiron";
+ services.websites.env.production.vhostConfs.immae_fr = {
+ certName = "immae";
addToCerts = true;
hosts = [ "www.immae.fr" "immae.fr" ];
root = null;
@@ -69,8 +87,8 @@ in {
'' ];
};
- services.websites.env.production.vhostConfs.bouya = {
- certName = "eldiron";
+ services.websites.env.production.vhostConfs.immae_bouya = {
+ certName = "immae";
addToCerts = true;
hosts = [ "bouya.org" "www.bouya.org" ];
root = null;