X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Fftp%2Fjerome.nix;h=a340644e60be27dbd18a44f4586a9e224764028e;hb=daf64e3f7de98e4267823d14fa34891b27b5f657;hp=218060f3f58fc30e35b4800948da17d0586b6df8;hpb=60dbbd12253f2f7b6994fea1c56fdf3818d0a025;p=perso%2FImmae%2FConfig%2FNix.git diff --git a/nixops/modules/websites/ftp/jerome.nix b/nixops/modules/websites/ftp/jerome.nix index 218060f..a340644 100644 --- a/nixops/modules/websites/ftp/jerome.nix +++ b/nixops/modules/websites/ftp/jerome.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, config, myconfig, mylibs, ... }: +{ lib, pkgs, config, myconfig, ... }: let adminer = pkgs.callPackage ../commons/adminer.nix {}; cfg = config.services.myWebsites.Jerome; @@ -11,28 +11,19 @@ in { }; }; - imports = [ - ../commons/stats.nix - ]; - config = lib.mkIf cfg.production.enable { - services.myWebsites.commons.stats.enable = true; - services.myWebsites.commons.stats.sites = [ - { - name = "naturaloutil.immae.eu"; - conf = ./jerome_goaccess.conf; - } - ]; + services.webstats.sites = [ { name = "naturaloutil.immae.eu"; } ]; security.acme.certs."ftp".extraDomains."naturaloutil.immae.eu" = null; security.acme.certs."naturaloutil" = config.services.myCertificates.certConfig // { domain = "naturaloutil.immae.eu"; }; - deployment.keys."prod-naturaloutil" = { - destDir = "/run/keys/webapps"; + secrets.keys = [{ + dest = "webapps/prod-naturaloutil"; user = "wwwrun"; group = "wwwrun"; + permissions = "0400"; text = '' ''; - }; - services.myPhpfpm.serviceDependencies.jerome = [ "mysql.service" "prod-naturaloutil-key.service" ]; + }]; + services.myPhpfpm.serviceDependencies.jerome = [ "mysql.service" ]; services.myPhpfpm.poolConfigs.jerome = '' listen = /run/phpfpm/naturaloutil.sock user = wwwrun @@ -61,14 +52,14 @@ in { pm.max_children = 5 pm.process_idle_timeout = 60 - env[BDD_CONNECT] = "/run/keys/webapps/prod-naturaloutil" - php_admin_value[open_basedir] = "/run/keys/webapps/prod-naturaloutil:${varDir}:/tmp" + env[BDD_CONNECT] = "/var/secrets/webapps/prod-naturaloutil" + php_admin_value[open_basedir] = "/var/secrets/webapps/prod-naturaloutil:${varDir}:/tmp" ''; services.myPhpfpm.poolPhpConfigs.jerome = '' extension=${pkgs.php}/lib/php/extensions/mysqli.so ''; - services.myWebsites.production.modules = adminer.apache.modules ++ [ "proxy_fcgi" ]; - services.myWebsites.production.vhostConfs.naturaloutil = { + services.websites.production.modules = adminer.apache.modules ++ [ "proxy_fcgi" ]; + services.websites.production.vhostConfs.naturaloutil = { certName = "naturaloutil"; hosts = ["naturaloutil.immae.eu" ]; root = varDir;