X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fprivate%2Fwebsites%2Frichie%2Fproduction.nix;h=a548cff21a4d8117adc5f954c01c34c4ca52f309;hb=bc0f9fcf0d366e10c0046390e516e11d5b76b2f8;hp=a6957af13937cf9b6620a64bef4e49f603a7da73;hpb=db343436f0e678ef3a97e6f8ac559ffa0507e422;p=perso%2FImmae%2FConfig%2FNix.git
diff --git a/modules/private/websites/richie/production.nix b/modules/private/websites/richie/production.nix
index a6957af..a548cff 100644
--- a/modules/private/websites/richie/production.nix
+++ b/modules/private/websites/richie/production.nix
@@ -17,7 +17,6 @@ let
sed -i "s@localedef --list-archive@localedef --list-archive /run/current-system/sw/lib/locale/locale-archive@" $out/admin/parametres.php
'';
};
- webappdir = config.services.websites.webappDirsPaths.richie_production;
secretPath = config.secrets.fullPaths."websites/richie/production";
apacheUser = config.services.httpd.Prod.user;
apacheGroup = config.services.httpd.Prod.group;
@@ -25,11 +24,9 @@ in
{
options.myServices.websites.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 = "websites/richie/production";
+ secrets.keys."websites/richie/production" = {
user = apacheUser;
group = apacheGroup;
permissions = "0400";
@@ -47,8 +44,7 @@ in
$smtp_mailer->Auth('${smtp_mailer.user}', '${smtp_mailer.password}');
?>
'';
- }];
- services.websites.webappDirs.richie_production = richieSrc;
+ };
system.activationScripts.richie_production = {
deps = [ "httpd" ];
text = ''
@@ -85,7 +81,7 @@ in
addToCerts = true;
certMainHost = "europe-richie.org";
hosts = [ "europe-richie.org" "www.europe-richie.org" ];
- root = webappdir;
+ root = richieSrc;
extraConfig = [
''
Use Stats europe-richie.org
@@ -93,7 +89,7 @@ in
Require all denied
-
+
DirectoryIndex index.php index.htm index.html
Options Indexes FollowSymLinks MultiViews Includes
AllowOverride None