diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-04-18 16:10:56 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-04-20 01:51:48 +0200 |
commit | d3452fc59b9839846225fd254926c64a9c71f071 (patch) | |
tree | a98a0958b826ac4b2ab137720edf0195c65dd958 /modules/private/websites/florian/integration.nix | |
parent | 514f9ec3beec470c4445be690673a0ceab9115b4 (diff) | |
download | Nix-d3452fc59b9839846225fd254926c64a9c71f071.tar.gz Nix-d3452fc59b9839846225fd254926c64a9c71f071.tar.zst Nix-d3452fc59b9839846225fd254926c64a9c71f071.zip |
Refactor websites
Diffstat (limited to 'modules/private/websites/florian/integration.nix')
-rw-r--r-- | modules/private/websites/florian/integration.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/modules/private/websites/florian/integration.nix b/modules/private/websites/florian/integration.nix index 4ee160a..5ebe531 100644 --- a/modules/private/websites/florian/integration.nix +++ b/modules/private/websites/florian/integration.nix | |||
@@ -1,9 +1,9 @@ | |||
1 | { lib, pkgs, config, ... }: | 1 | { lib, pkgs, config, ... }: |
2 | let | 2 | let |
3 | adminer = pkgs.callPackage ../commons/adminer.nix { inherit config; }; | 3 | adminer = pkgs.callPackage ../commons/adminer.nix { inherit config; }; |
4 | cfg = config.myServices.websites.florian.integration; | 4 | cfg = config.myServices.websites.florian.integration; |
5 | varDir = "/var/lib/ftp/florian"; | 5 | varDir = "/var/lib/ftp/florian/florian.immae.eu"; |
6 | env = config.myEnv.websites.florian; | 6 | env = config.myEnv.websites.florian; |
7 | in { | 7 | in { |
8 | options.myServices.websites.florian.integration.enable = lib.mkEnableOption "enable Florian's website integration"; | 8 | options.myServices.websites.florian.integration.enable = lib.mkEnableOption "enable Florian's website integration"; |
9 | 9 | ||
@@ -11,17 +11,17 @@ in { | |||
11 | security.acme.certs."ftp".extraDomains."florian.immae.eu" = null; | 11 | security.acme.certs."ftp".extraDomains."florian.immae.eu" = null; |
12 | 12 | ||
13 | services.websites.env.integration.modules = adminer.apache.modules; | 13 | services.websites.env.integration.modules = adminer.apache.modules; |
14 | services.websites.env.integration.vhostConfs.florian = { | 14 | services.websites.env.integration.vhostConfs.florian_integration = { |
15 | certName = "integration"; | 15 | certName = "integration"; |
16 | addToCerts = true; | 16 | addToCerts = true; |
17 | hosts = [ "florian.immae.eu" ]; | 17 | hosts = [ "florian.immae.eu" ]; |
18 | root = "${varDir}/florian.immae.eu"; | 18 | root = varDir; |
19 | extraConfig = [ | 19 | extraConfig = [ |
20 | (adminer.apache.vhostConf null) | 20 | (adminer.apache.vhostConf null) |
21 | '' | 21 | '' |
22 | ServerAdmin ${env.server_admin} | 22 | ServerAdmin ${env.server_admin} |
23 | 23 | ||
24 | <Directory ${varDir}/florian.immae.eu> | 24 | <Directory ${varDir}> |
25 | DirectoryIndex index.php index.htm index.html | 25 | DirectoryIndex index.php index.htm index.html |
26 | Options Indexes FollowSymLinks MultiViews Includes | 26 | Options Indexes FollowSymLinks MultiViews Includes |
27 | AllowOverride None | 27 | AllowOverride None |