summaryrefslogtreecommitdiffstats
path: root/lass/2configs/websites
diff options
context:
space:
mode:
Diffstat (limited to 'lass/2configs/websites')
-rw-r--r--lass/2configs/websites/domsen.nix3
-rw-r--r--lass/2configs/websites/lassulus.nix8
2 files changed, 6 insertions, 5 deletions
diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix
index b9673de7..80ed12ed 100644
--- a/lass/2configs/websites/domsen.nix
+++ b/lass/2configs/websites/domsen.nix
@@ -25,6 +25,7 @@ in {
imports = [
./default.nix
./sqlBackup.nix
+ (servePage [ "aldonasiech.com" "www.aldonasiech.com" ])
(servePage [ "reich-gebaeudereinigung.de" "www.reich-gebaeudereinigung.de" ])
(servePage [
"freemonkey.art"
@@ -35,7 +36,6 @@ in {
"ubikmedia.de"
"apanowicz.de"
"nirwanabluete.de"
- "aldonasiech.com"
"ubikmedia.eu"
"youthtube.xyz"
"joemisch.com"
@@ -44,7 +44,6 @@ in {
"www.apanowicz.de"
"www.nirwanabluete.de"
- "www.aldonasiech.com"
"www.ubikmedia.eu"
"www.youthtube.xyz"
"www.ubikmedia.de"
diff --git a/lass/2configs/websites/lassulus.nix b/lass/2configs/websites/lassulus.nix
index f04f312d..901fecfb 100644
--- a/lass/2configs/websites/lassulus.nix
+++ b/lass/2configs/websites/lassulus.nix
@@ -47,7 +47,8 @@ in {
alias ${pkgs.writeText "prism.wg" config.krebs.hosts.prism.nets.wiregrill.wireguard.pubkey};
'';
locations."/tinc/".extraConfig = ''
- alias ${config.krebs.tinc_graphs.workingDir}/external;
+ index index.html;
+ alias ${config.krebs.tinc_graphs.workingDir}/external/;
'';
locations."= /krebspage".extraConfig = ''
default_type "text/html";
@@ -60,10 +61,10 @@ in {
in ''
alias ${initscript};
'';
- locations."= /pub".extraConfig = ''
+ locations."= /blue.pub".extraConfig = ''
alias ${pkgs.writeText "pub" config.krebs.users.lass.pubkey};
'';
- locations."= /pub1".extraConfig = ''
+ locations."= /mors.pub".extraConfig = ''
alias ${pkgs.writeText "pub" config.krebs.users.lass-mors.pubkey};
'';
};
@@ -93,6 +94,7 @@ in {
users.users.blog = {
uid = genid_uint31 "blog";
+ group = "nginx";
description = "lassul.us blog deployment";
home = "/srv/http/lassul.us";
useDefaultShell = true;