X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Fdefault.nix;h=6a0a19fe32f8ebcacee0032b9ead1c0442c00ad2;hb=97953ca44b0438d6b366d610678906944ea63835;hp=307af084988ea880218346d67e5397a7aea1b3fb;hpb=981634865c275c1f35e78a27c6d76cd9708fd7ef;p=perso%2FImmae%2FConfig%2FNix.git diff --git a/nixops/modules/websites/default.nix b/nixops/modules/websites/default.nix index 307af08..6a0a19f 100644 --- a/nixops/modules/websites/default.nix +++ b/nixops/modules/websites/default.nix @@ -8,7 +8,7 @@ let enableSSL = true; sslServerCert = "/var/lib/acme/${vhostConf.certName}/cert.pem"; sslServerKey = "/var/lib/acme/${vhostConf.certName}/key.pem"; - sslServerChain = "/var/lib/acme/${vhostConf.certName}/fullchain.pem"; + sslServerChain = "/var/lib/acme/${vhostConf.certName}/chain.pem"; logFormat = "combinedVhost"; listen = map (ip: { inherit ip; port = 443; }) cfg.ips; hostName = builtins.head vhostConf.hosts; @@ -117,6 +117,7 @@ in ./ftp/florian.nix ./ftp/denisejerome.nix ./ftp/leila.nix + ./ftp/papa.nix ./ftp/immae.nix ./ftp/release.nix ./ftp/temp.nix @@ -214,6 +215,7 @@ in services.myWebsites.Nassime.production.enable = cfg.production.enable; services.myWebsites.Florian.production.enable = cfg.production.enable; services.myWebsites.Leila.production.enable = cfg.production.enable; + services.myWebsites.Papa.production.enable = cfg.production.enable; services.myWebsites.DeniseJerome.production.enable = cfg.production.enable; services.myWebsites.Emilia.production.enable = cfg.production.enable; services.myWebsites.Capitaines.production.enable = cfg.production.enable; @@ -229,6 +231,25 @@ in services.myWebsites.TellesFlorian.integration.enable = true; services.myWebsites.Florian.integration.enable = true; + mySecrets.keys = [{ + dest = "apache-ldap"; + user = "wwwrun"; + group = "wwwrun"; + permissions = "0400"; + text = '' + + + AuthLDAPURL ldap://ldap.immae.eu:389/dc=immae,dc=eu STARTTLS + AuthLDAPBindDN cn=httpd,ou=services,dc=immae,dc=eu + AuthLDAPBindPassword "${myconfig.env.httpd.ldap.password}" + AuthType Basic + AuthName "Authentification requise (Acces LDAP)" + AuthBasicProvider ldap + + + ''; + }]; + services.myWebsites.apacheConfig = { gzip = { modules = [ "deflate" "filter" ]; @@ -266,16 +287,7 @@ in LDAPOpCacheTTL 600 - - - AuthLDAPURL ldap://ldap.immae.eu:389/dc=immae,dc=eu STARTTLS - AuthLDAPBindDN cn=httpd,ou=services,dc=immae,dc=eu - AuthLDAPBindPassword "${myconfig.env.httpd.ldap.password}" - AuthType Basic - AuthName "Authentification requise (Acces LDAP)" - AuthBasicProvider ldap - - + Include /var/secrets/apache-ldap ''; }; global = { @@ -397,8 +409,10 @@ in install -d -m 0755 /var/lib/acme/acme-challenge install -d -m 0750 -o wwwrun -g wwwrun /var/lib/php/sessions install -d -m 0750 -o wwwrun -g wwwrun /var/lib/php/sessions/adminer + install -d -m 0750 -o wwwrun -g wwwrun /var/lib/php/tmp/adminer install -d -m 0750 -o wwwrun -g wwwrun /var/lib/php/sessions/mantisbt install -d -m 0750 -o wwwrun -g wwwrun /var/lib/php/sessions/davical + install -d -m 0750 -o wwwrun -g wwwrun /var/lib/php/sessions/phpldapadmin ''; };