diff --git a/hosts/org/configuration.nix b/hosts/org/configuration.nix index 86eb3a2..3f4310f 100644 --- a/hosts/org/configuration.nix +++ b/hosts/org/configuration.nix @@ -16,6 +16,7 @@ ./dokuwiki.nix ./matterbridge.nix ./orga + ./static-sites ]; networking.hostName = "hackens-org"; # Define your hostname. diff --git a/hosts/org/dokuwiki.nix b/hosts/org/dokuwiki.nix index 75ac971..c369ae0 100644 --- a/hosts/org/dokuwiki.nix +++ b/hosts/org/dokuwiki.nix @@ -1,7 +1,5 @@ { config, pkgs, lib, ... }: { - imports = [ ../../shared/dokuwiki_module.nix ]; - disabledModules = [ ]; services.nginx.virtualHosts."new.hackens.org" = { enableACME = true; forceSSL = true; diff --git a/hosts/org/static-sites.nix b/hosts/org/static-sites.nix new file mode 100644 index 0000000..035c5b0 --- /dev/null +++ b/hosts/org/static-sites.nix @@ -0,0 +1,23 @@ +{ pkgs, lib, ... }: +let + sites = [ + "/NdS" + "/2048" + "/prez" + "/known" + "/pub" + ]; +in +{ + + services.nginx.enable = true; + services.nginx.virtualHosts."new.hackens.org" = { + forceSSL = true; + enableACME = true; + locations = lib.genAttrs sites (name: { + root = "/var/www"; + extraConfig = "autoindex on;"; + }); + }; + networking.firewall.allowedTCPPorts = [ 80 443 ]; +} diff --git a/hosts/org/webpass.nix b/hosts/org/webpass.nix index 15f8628..85d5a94 100644 --- a/hosts/org/webpass.nix +++ b/hosts/org/webpass.nix @@ -14,7 +14,7 @@ SIGNUPS_DOMAINS_WHITELIST = "ens.fr,ens.psl.eu"; ROCKET_PORT = 10501; ROCKET_ADDRESS = "127.0.0.1"; - LOG_FILE = "/var/log/vaultwarden"; + LOG_FILE = "/var/lib/bitwarden_rs/logfile"; SIGNUPS_VERIFY = true; }; environmentFile = "/etc/secrets/vaultwarden.env";