X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Fdefault.nix;h=7ed00db014a4efa86a3e3cbf9cdf4e2d982a9ca2;hb=8a964143a4173fcbd6f398fffee727f228f952fa;hp=f820c83ceb04c5a301ae7fd0522d6a13d998309e;hpb=415bcd272a0cbd65494fbb245bd94f0420656044;p=perso%2FImmae%2FConfig%2FNix.git
diff --git a/nixops/modules/websites/default.nix b/nixops/modules/websites/default.nix
index f820c83..7ed00db 100644
--- a/nixops/modules/websites/default.nix
+++ b/nixops/modules/websites/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, config, mylibs, myconfig, ... }:
+{ lib, pkgs, config, myconfig, ... }:
let
cfg = config.services.myWebsites;
www_root = "/run/current-system/webapps/_www";
@@ -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,19 +117,20 @@ in
./ftp/florian.nix
./ftp/denisejerome.nix
./ftp/leila.nix
+ ./ftp/papa.nix
./ftp/immae.nix
./ftp/release.nix
./ftp/temp.nix
- ./tools/db
+ ./tools/db.nix
./tools/tools
./tools/dav
- ./tools/cloud
+ ./tools/cloud.nix
./tools/git
- ./tools/mastodon
- ./tools/mediagoblin
- ./tools/diaspora
- ./tools/ether
- ./tools/peertube
+ ./tools/mastodon.nix
+ ./tools/mediagoblin.nix
+ ./tools/diaspora.nix
+ ./tools/ether.nix
+ ./tools/peertube.nix
# built using:
# sed -e "s/services\.httpd/services\.httpdProd/g" .nix-defexpr/channels/nixpkgs/nixos/modules/services/web-servers/apache-httpd/default.nix
# Removed allGranted
@@ -189,9 +190,6 @@ in
# '';
});
phpPackages = super.php72Packages.override { inherit php; };
- composerEnv = import ./commons/composer-env.nix {
- inherit (self) stdenv writeTextFile fetchurl php unzip;
- };
}) ];
services.myWebsites.tools.databases.enable = true;
@@ -214,6 +212,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,10 +228,11 @@ in
services.myWebsites.TellesFlorian.integration.enable = true;
services.myWebsites.Florian.integration.enable = true;
- deployment.keys.apache-ldap = {
+ secrets.keys = [{
+ dest = "apache-ldap";
user = "wwwrun";
group = "wwwrun";
- permissions = "0700";
+ permissions = "0400";
text = ''
@@ -245,7 +245,7 @@ in
'';
- };
+ }];
services.myWebsites.apacheConfig = {
gzip = {
@@ -260,13 +260,13 @@ in
stats = {
extraConfig = ''
- Alias /awstats /var/lib/goaccess/%{domain}
-
+ Alias /webstats ${config.services.webstats.dataDir}/%{domain}
+
DirectoryIndex index.html
AllowOverride None
Require all granted
-
+
Use LDAPConnect
Require ldap-group cn=%{domain},ou=stats,cn=httpd,ou=services,dc=immae,dc=eu
@@ -284,7 +284,7 @@ in
LDAPOpCacheTTL 600
- Include /run/keys/apache-ldap
+ Include /var/secrets/apache-ldap
'';
};
global = {
@@ -406,8 +406,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
'';
};