summaryrefslogtreecommitdiffstats
path: root/lass/2configs/websites
diff options
context:
space:
mode:
Diffstat (limited to 'lass/2configs/websites')
-rw-r--r--lass/2configs/websites/domsen.nix50
-rw-r--r--lass/2configs/websites/lassulus.nix9
2 files changed, 53 insertions, 6 deletions
diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix
index 71eae5b71..e79973a66 100644
--- a/lass/2configs/websites/domsen.nix
+++ b/lass/2configs/websites/domsen.nix
@@ -57,14 +57,15 @@ in {
"www.illucloud.de"
"www.illucloud.com"
"www.ubikmedia.de"
+ "aldona2.ubikmedia.de"
"apanowicz.ubikmedia.de"
- "karlaskop.ubikmedia.de"
- "nb.ubikmedia.de"
"cinevita.ubikmedia.de"
"factscloud.ubikmedia.de"
- "youthtube.ubikmedia.de"
- "aldona2.ubikmedia.de"
"illucloud.ubikmedia.de"
+ "joemisch.ubikmedia.de"
+ "karlaskop.ubikmedia.de"
+ "nb.ubikmedia.de"
+ "youthtube.ubikmedia.de"
])
];
@@ -111,17 +112,26 @@ in {
'';
internet-aliases = [
{ from = "dominik@apanowicz.de"; to = "dominik_a@gmx.de"; }
+ { from = "dma@ubikmedia.de"; to = "domsen"; }
+ { from = "dma@ubikmedia.eu"; to = "domsen"; }
{ from = "mail@jla-trading.com"; to = "jla-trading"; }
+ { from = "jms@ubikmedia.eu"; to = "jms"; }
+ { from = "ms@ubikmedia.eu"; to = "ms"; }
+ { from = "nrg@ubikmedia.eu"; to = "nrg"; }
+ { from = "ubik@ubikmedia.eu"; to = "domsen, jms, ms, nrg"; }
+
+ { from = "testuser@lassul.us"; to = "testuser"; }
];
sender_domains = [
"jla-trading.com"
+ "ubikmedia.eu"
];
ssl_cert = "/var/lib/acme/lassul.us/fullchain.pem";
ssl_key = "/var/lib/acme/lassul.us/key.pem";
};
users.users.domsen = {
- uid = genid "domsen";
+ uid = genid_signed "domsen";
description = "maintenance acc for domsen";
home = "/home/domsen";
useDefaultShell = true;
@@ -130,10 +140,38 @@ in {
};
users.users.jla-trading = {
- uid = genid "jla-trading";
+ uid = genid_signed "jla-trading";
home = "/home/jla-trading";
useDefaultShell = true;
createHome = true;
};
+
+ users.users.jms = {
+ uid = genid_signed "jms";
+ home = "/home/jms";
+ useDefaultShell = true;
+ createHome = true;
+ };
+
+ users.users.ms = {
+ uid = genid_signed "ms";
+ home = "/home/ms";
+ useDefaultShell = true;
+ createHome = true;
+ };
+
+ users.users.nrg = {
+ uid = genid_signed "nrg";
+ home = "/home/nrg";
+ useDefaultShell = true;
+ createHome = true;
+ };
+
+ users.users.testuser = {
+ uid = genid_signed "testuser";
+ home = "/home/testuser";
+ useDefaultShell = true;
+ createHome = true;
+ };
}
diff --git a/lass/2configs/websites/lassulus.nix b/lass/2configs/websites/lassulus.nix
index cfdda05db..024d2eeb2 100644
--- a/lass/2configs/websites/lassulus.nix
+++ b/lass/2configs/websites/lassulus.nix
@@ -83,6 +83,7 @@ in {
locations."/tinc".extraConfig = ''
alias ${config.krebs.tinc_graphs.workingDir}/external;
'';
+ # TODO make this work!
locations."= /ddate".extraConfig = let
script = pkgs.writeBash "test" ''
echo "hello world"
@@ -100,6 +101,14 @@ in {
fastcgi_param SCRIPT_NAME ${script};
'';
+ locations."/init".extraConfig = let
+ initscript = pkgs.init.override {
+ pubkey = config.krebs.users.lass.pubkey;
+ };
+ in ''
+ alias ${initscript};
+ '';
+
enableSSL = true;
extraConfig = "listen 80;";
sslCertificate = "/var/lib/acme/lassul.us/fullchain.pem";