From 5691537512d24aa542c7ae2d9225c46712e1e811 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 24 May 2016 22:46:41 +0200 Subject: l 2 websites fritz: prefix www. everywhere --- lass/2configs/websites/fritz.nix | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'lass/2configs/websites/fritz.nix') diff --git a/lass/2configs/websites/fritz.nix b/lass/2configs/websites/fritz.nix index e35615040..4b539bc10 100644 --- a/lass/2configs/websites/fritz.nix +++ b/lass/2configs/websites/fritz.nix @@ -13,26 +13,26 @@ in { ( manageCerts [ "biostase.de" "www.biostase.de" ]) #( serveWordpress [ "biostase.de" "www.biostase.de" ]) - ( manageCerts [ "radical-dreamers.de" ]) - ( serveWordpress [ "radical-dreamers.de" ]) + ( manageCerts [ "radical-dreamers.de" "www.radical-dreamers.de" ]) + ( serveWordpress [ "radical-dreamers.de" "www.radical-dreamers.de" ]) - ( manageCerts [ "gs-maubach.de" ]) - ( serveWordpress [ "gs-maubach.de" ]) + ( manageCerts [ "gs-maubach.de" "www.gs-maubach.de" ]) + ( serveWordpress [ "gs-maubach.de" "www.gs-maubach.de" ]) - ( manageCerts [ "spielwaren-kern.de" ]) - ( serveWordpress [ "spielwaren-kern.de" ]) + ( manageCerts [ "spielwaren-kern.de" "www.spielwaren-kern.de" ]) + ( serveWordpress [ "spielwaren-kern.de" "www.spielwaren-kern.de" ]) - ( manageCerts [ "familienpraxis-korntal.de" ]) - ( servePage [ "familienpraxis-korntal.de" ]) + ( manageCerts [ "familienpraxis-korntal.de" "www.familienpraxis-korntal.de" ]) + ( servePage [ "familienpraxis-korntal.de" "www.familienpraxis-korntal.de" ]) - ( manageCerts [ "ttf-kleinaspach.de" ]) - ( serveWordpress [ "ttf-kleinaspach.de" ]) + ( manageCerts [ "ttf-kleinaspach.de" "www.ttf-kleinaspach.de" ]) + ( serveWordpress [ "ttf-kleinaspach.de" "www.ttf-kleinaspach.de" ]) - ( ssl [ "eastuttgart.de" ]) - ( serveWordpress [ "eastuttgart.de" ]) + ( ssl [ "eastuttgart.de" "www.eastuttgart.de" ]) + ( serveWordpress [ "eastuttgart.de" "www.eastuttgart.de" ]) - ( ssl [ "habsys.de" "habsys.eu" ]) - ( servePage [ "habsys.de" "habsys.eu" ]) + ( ssl [ "www.habsys.de" "habsys.de" "www.habsys.eu" "habsys.eu" ]) + ( servePage [ "www.habsys.de" "habsys.de" "www.habsys.eu" "habsys.eu" ]) ]; services.mysql = { -- cgit v1.2.3 From f1cbe54717e4f8f1b648e22f644a32f1b9abf82a Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 24 May 2016 23:20:11 +0200 Subject: l 2 websites fritz: serve biostase.de --- lass/2configs/websites/fritz.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lass/2configs/websites/fritz.nix') diff --git a/lass/2configs/websites/fritz.nix b/lass/2configs/websites/fritz.nix index 4b539bc10..5ce2887c4 100644 --- a/lass/2configs/websites/fritz.nix +++ b/lass/2configs/websites/fritz.nix @@ -11,7 +11,7 @@ let in { imports = [ ( manageCerts [ "biostase.de" "www.biostase.de" ]) - #( serveWordpress [ "biostase.de" "www.biostase.de" ]) + ( serveWordpress [ "biostase.de" "www.biostase.de" ]) ( manageCerts [ "radical-dreamers.de" "www.radical-dreamers.de" ]) ( serveWordpress [ "radical-dreamers.de" "www.radical-dreamers.de" ]) -- cgit v1.2.3 From 5b4333f2a72b167d7640f15c68e3bbb0aab7809d Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 24 May 2016 23:21:43 +0200 Subject: l 2 websites fritz: add fritz root authorizedKeys --- lass/2configs/websites/fritz.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lass/2configs/websites/fritz.nix') diff --git a/lass/2configs/websites/fritz.nix b/lass/2configs/websites/fritz.nix index 5ce2887c4..b0473c2ff 100644 --- a/lass/2configs/websites/fritz.nix +++ b/lass/2configs/websites/fritz.nix @@ -54,4 +54,7 @@ in { ]; }; }; + users.users.root.openssh.authorizedKeys.keys = [ + config.krebs.users.fritz.pubkey + ]; } -- cgit v1.2.3 From b78cafa686a4e01f815f75d1c815996e54fa4597 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 25 May 2016 16:32:59 +0200 Subject: l 2 websites fritz: use ssl everywhere --- lass/2configs/websites/fritz.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'lass/2configs/websites/fritz.nix') diff --git a/lass/2configs/websites/fritz.nix b/lass/2configs/websites/fritz.nix index b0473c2ff..b063504f0 100644 --- a/lass/2configs/websites/fritz.nix +++ b/lass/2configs/websites/fritz.nix @@ -10,28 +10,28 @@ let in { imports = [ - ( manageCerts [ "biostase.de" "www.biostase.de" ]) + ( ssl [ "biostase.de" "www.biostase.de" ]) ( serveWordpress [ "biostase.de" "www.biostase.de" ]) - ( manageCerts [ "radical-dreamers.de" "www.radical-dreamers.de" ]) + ( ssl [ "radical-dreamers.de" "www.radical-dreamers.de" ]) ( serveWordpress [ "radical-dreamers.de" "www.radical-dreamers.de" ]) - ( manageCerts [ "gs-maubach.de" "www.gs-maubach.de" ]) + ( ssl [ "gs-maubach.de" "www.gs-maubach.de" ]) ( serveWordpress [ "gs-maubach.de" "www.gs-maubach.de" ]) - ( manageCerts [ "spielwaren-kern.de" "www.spielwaren-kern.de" ]) + ( ssl [ "spielwaren-kern.de" "www.spielwaren-kern.de" ]) ( serveWordpress [ "spielwaren-kern.de" "www.spielwaren-kern.de" ]) - ( manageCerts [ "familienpraxis-korntal.de" "www.familienpraxis-korntal.de" ]) + ( ssl [ "familienpraxis-korntal.de" "www.familienpraxis-korntal.de" ]) ( servePage [ "familienpraxis-korntal.de" "www.familienpraxis-korntal.de" ]) - ( manageCerts [ "ttf-kleinaspach.de" "www.ttf-kleinaspach.de" ]) + ( ssl [ "ttf-kleinaspach.de" "www.ttf-kleinaspach.de" ]) ( serveWordpress [ "ttf-kleinaspach.de" "www.ttf-kleinaspach.de" ]) ( ssl [ "eastuttgart.de" "www.eastuttgart.de" ]) ( serveWordpress [ "eastuttgart.de" "www.eastuttgart.de" ]) - ( ssl [ "www.habsys.de" "habsys.de" "www.habsys.eu" "habsys.eu" ]) + #( ssl [ "www.habsys.de" "habsys.de" "www.habsys.eu" "habsys.eu" ]) ( servePage [ "www.habsys.de" "habsys.de" "www.habsys.eu" "habsys.eu" ]) ]; -- cgit v1.2.3 From 80e50fd8a05192faaf0e6f87faa3ea9c0313aa32 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 31 May 2016 23:26:35 +0200 Subject: l: move websites libs to 2/websites/util --- lass/2configs/websites/fritz.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'lass/2configs/websites/fritz.nix') diff --git a/lass/2configs/websites/fritz.nix b/lass/2configs/websites/fritz.nix index b063504f0..487c4644e 100644 --- a/lass/2configs/websites/fritz.nix +++ b/lass/2configs/websites/fritz.nix @@ -1,12 +1,16 @@ { config, pkgs, lib, ... }: let - inherit (import ../../4lib { inherit lib pkgs; }) - manageCerts - activateACME + inherit (import { config = {}; inherit lib; }) + genid + head + nameValuePair + ; + inherit (import {inherit lib pkgs;}) ssl servePage - serveWordpress; + serveWordpress + ; in { imports = [ -- cgit v1.2.3 From 76296d5cc5f1ddb1108c3f213204bb386353ad93 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 1 Jun 2016 00:13:19 +0200 Subject: l 2 websites: put sqlBackup in seperate file --- lass/2configs/websites/fritz.nix | 58 +++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 34 deletions(-) (limited to 'lass/2configs/websites/fritz.nix') diff --git a/lass/2configs/websites/fritz.nix b/lass/2configs/websites/fritz.nix index 487c4644e..63efbecb6 100644 --- a/lass/2configs/websites/fritz.nix +++ b/lass/2configs/websites/fritz.nix @@ -14,50 +14,40 @@ let in { imports = [ - ( ssl [ "biostase.de" "www.biostase.de" ]) - ( serveWordpress [ "biostase.de" "www.biostase.de" ]) + ./sqlBackup.nix + (ssl [ "biostase.de" "www.biostase.de" ]) + (serveWordpress [ "biostase.de" "www.biostase.de" ]) - ( ssl [ "radical-dreamers.de" "www.radical-dreamers.de" ]) - ( serveWordpress [ "radical-dreamers.de" "www.radical-dreamers.de" ]) + (ssl [ "radical-dreamers.de" "www.radical-dreamers.de" ]) + (serveWordpress [ "radical-dreamers.de" "www.radical-dreamers.de" ]) - ( ssl [ "gs-maubach.de" "www.gs-maubach.de" ]) - ( serveWordpress [ "gs-maubach.de" "www.gs-maubach.de" ]) + (ssl [ "gs-maubach.de" "www.gs-maubach.de" ]) + (serveWordpress [ "gs-maubach.de" "www.gs-maubach.de" ]) - ( ssl [ "spielwaren-kern.de" "www.spielwaren-kern.de" ]) - ( serveWordpress [ "spielwaren-kern.de" "www.spielwaren-kern.de" ]) + (ssl [ "spielwaren-kern.de" "www.spielwaren-kern.de" ]) + (serveWordpress [ "spielwaren-kern.de" "www.spielwaren-kern.de" ]) - ( ssl [ "familienpraxis-korntal.de" "www.familienpraxis-korntal.de" ]) - ( servePage [ "familienpraxis-korntal.de" "www.familienpraxis-korntal.de" ]) + (ssl [ "familienpraxis-korntal.de" "www.familienpraxis-korntal.de" ]) + (servePage [ "familienpraxis-korntal.de" "www.familienpraxis-korntal.de" ]) - ( ssl [ "ttf-kleinaspach.de" "www.ttf-kleinaspach.de" ]) - ( serveWordpress [ "ttf-kleinaspach.de" "www.ttf-kleinaspach.de" ]) + (ssl [ "ttf-kleinaspach.de" "www.ttf-kleinaspach.de" ]) + (serveWordpress [ "ttf-kleinaspach.de" "www.ttf-kleinaspach.de" ]) - ( ssl [ "eastuttgart.de" "www.eastuttgart.de" ]) - ( serveWordpress [ "eastuttgart.de" "www.eastuttgart.de" ]) + (ssl [ "eastuttgart.de" "www.eastuttgart.de" ]) + (serveWordpress [ "eastuttgart.de" "www.eastuttgart.de" ]) - #( ssl [ "www.habsys.de" "habsys.de" "www.habsys.eu" "habsys.eu" ]) - ( servePage [ "www.habsys.de" "habsys.de" "www.habsys.eu" "habsys.eu" ]) + (ssl [ "habsys.de" "www.habsys.de" "habsys.eu" "www.habsys.eu" ]) + (servePage [ "habsys.de" "www.habsys.de" "habsys.eu" "www.habsys.eu" ]) ]; - services.mysql = { - enable = true; - package = pkgs.mariadb; - rootPassword = toString (); - }; + lass.mysqlBackup.config.all.databases = [ + "biostase_de" + "eastuttgart_de" + "radical_dreamers_de" + "spielwaren_kern_de" + "ttf_kleinaspach_de" + ]; - lass.mysqlBackup = { - enable = true; - config.fritz = { - password = toString (); - databases = [ - "biostase_de" - "eastuttgart_de" - "radical_dreamers_de" - "spielwaren_kern_de" - "ttf_kleinaspach_de" - ]; - }; - }; users.users.root.openssh.authorizedKeys.keys = [ config.krebs.users.fritz.pubkey ]; -- cgit v1.2.3