waffentrager: changes to services

This commit is contained in:
Mateusz Słodkowicz 2024-08-23 18:48:38 +02:00
parent 04808eb9da
commit e7bff66b1e
Signed by: materus
GPG Key ID: 28D140BCA60B4FD1
6 changed files with 6 additions and 6 deletions

View File

@ -32,7 +32,6 @@
}; };
systemd.services.lldap = { systemd.services.lldap = {
partOf = [ "elements-mount.service" ];
requires = [ "elements-mount.service" ]; requires = [ "elements-mount.service" ];
after = [ "elements-mount.service" ]; after = [ "elements-mount.service" ];
serviceConfig = { serviceConfig = {

View File

@ -41,6 +41,7 @@
inherit notify_push previewgenerator; inherit notify_push previewgenerator;
}; };
settings = { settings = {
log_type = "file";
"profile.enabled" = true; "profile.enabled" = true;
default_phone_region = "PL"; default_phone_region = "PL";
trusted_proxies = [ materusArg.ips.valkyrie materusArg.ips.wireguard.valkyrie materusArg.ips.wireguard.waffentrager ]; trusted_proxies = [ materusArg.ips.valkyrie materusArg.ips.wireguard.valkyrie materusArg.ips.wireguard.waffentrager ];
@ -81,7 +82,7 @@
"opcache.fast_shutdown" = "1"; "opcache.fast_shutdown" = "1";
"opcache.save_comments" = "1"; "opcache.save_comments" = "1";
}; };
phpExtraExtensions = ex: [ ex.zip ex.zlib ex.tidy ex.smbclient ]; phpExtraExtensions = ex: [ ex.zip ex.zlib ex.tidy ex.smbclient ex.sodium ];
}; };
services.nginx.virtualHosts.${config.services.nextcloud.hostName} = { services.nginx.virtualHosts.${config.services.nextcloud.hostName} = {
forceSSL = true; forceSSL = true;
@ -91,6 +92,10 @@
sslCertificate = "/var/lib/mnt_acme/materus.pl/fullchain.pem"; sslCertificate = "/var/lib/mnt_acme/materus.pl/fullchain.pem";
extraConfig = '' extraConfig = ''
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
dav_methods PUT DELETE MKCOL COPY MOVE;
dav_ext_methods PROPFIND OPTIONS;
create_full_put_path on;
dav_access user:rw group:rw all:r;
''; '';
}; };
}; };

View File

@ -20,7 +20,6 @@
host all all ::1/128 scram-sha-256 host all all ::1/128 scram-sha-256
''; '';
systemd.services.postgresql = { systemd.services.postgresql = {
partOf = [ "elements-mount.service" ];
requires = [ "elements-mount.service" ]; requires = [ "elements-mount.service" ];
after = [ "elements-mount.service" ]; after = [ "elements-mount.service" ];
}; };

View File

@ -10,12 +10,10 @@
waffentragerService.elements.enable = true; waffentragerService.elements.enable = true;
systemd.services.samba-nmbd = { systemd.services.samba-nmbd = {
partOf = [ "elements-mount.service" ];
requires = [ "elements-mount.service" ]; requires = [ "elements-mount.service" ];
after = [ "elements-mount.service" ]; after = [ "elements-mount.service" ];
}; };
systemd.services.samba-wsdd = { systemd.services.samba-wsdd = {
partOf = [ "elements-mount.service" ];
requires = [ "elements-mount.service" ]; requires = [ "elements-mount.service" ];
after = [ "elements-mount.service" ]; after = [ "elements-mount.service" ];
}; };

View File

@ -10,7 +10,6 @@
waffentragerService.elements.enable = true; networking.firewall.allowedTCPPorts = [ 22000 config.services.syncthing.relay.statusPort config.services.syncthing.relay.port]; waffentragerService.elements.enable = true; networking.firewall.allowedTCPPorts = [ 22000 config.services.syncthing.relay.statusPort config.services.syncthing.relay.port];
networking.firewall.allowedUDPPorts = [ 22000 21027 ]; networking.firewall.allowedUDPPorts = [ 22000 21027 ];
systemd.services.syncthing = { systemd.services.syncthing = {
partOf = [ "elements-mount.service" ];
requires = [ "elements-mount.service" ]; requires = [ "elements-mount.service" ];
after = [ "elements-mount.service" ]; after = [ "elements-mount.service" ];
}; };