-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig, ... }:
let
adminer = pkgs.callPackage ../commons/adminer.nix {};
cfg = config.services.myWebsites.Jerome;
};
};
- 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";
$database = connect_db($db, $mysql_server, $mysql_base, $mysql_user, $mysql_password);
?>
'';
- };
- 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
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 = {
- certName = "naturaloutil";
- hosts = ["naturaloutil.immae.eu" ];
- root = varDir;
- extraConfig = [
+ services.websites.production.modules = adminer.apache.modules ++ [ "proxy_fcgi" ];
+ services.websites.production.vhostConfs.naturaloutil = {
+ certName = "naturaloutil";
+ certMainHost = "naturaloutil.immae.eu";
+ hosts = ["naturaloutil.immae.eu" ];
+ root = varDir;
+ extraConfig = [
adminer.apache.vhostConf
''
Use Stats naturaloutil.immae.eu