From 23562e36190e07f338211541ac3d2cc77ebdbafa Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 17 Dec 2018 09:33:45 +0100
Subject: l domsen: add alewis.de to sender_domains

---
 lass/2configs/websites/domsen.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lass/2configs/websites')

diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix
index ce7df4bfb..25dac0ac4 100644
--- a/lass/2configs/websites/domsen.nix
+++ b/lass/2configs/websites/domsen.nix
@@ -135,6 +135,7 @@ in {
       "jla-trading.com"
       "ubikmedia.eu"
       "ubikmedia.de"
+      "alewis.de"
     ];
     ssl_cert = "/var/lib/acme/lassul.us/fullchain.pem";
     ssl_key = "/var/lib/acme/lassul.us/key.pem";
-- 
cgit v1.3.1


From a46b64750512ebc167a65a39b563eeca8ce8d8b9 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 25 Dec 2018 14:28:41 +0100
Subject: l websites: add wireguard-key location

---
 lass/2configs/websites/lassulus.nix | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'lass/2configs/websites')

diff --git a/lass/2configs/websites/lassulus.nix b/lass/2configs/websites/lassulus.nix
index 17af0d00d..307f1c2b3 100644
--- a/lass/2configs/websites/lassulus.nix
+++ b/lass/2configs/websites/lassulus.nix
@@ -63,6 +63,9 @@ in {
     locations."= /retiolum.hosts".extraConfig = ''
       alias ${pkgs.retiolum-hosts};
     '';
+    locations."= /wireguard-key".extraConfig = ''
+      alias ${pkgs.writeText "prism.wg" config.krebs.hosts.prism.nets.wiregrill.wireguard.pubkey};
+    '';
     locations."/tinc".extraConfig = ''
       alias ${config.krebs.tinc_graphs.workingDir}/external;
     '';
-- 
cgit v1.3.1


From 81de4a0473da780b449c9a5e502c2c6a12f57d3d Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 25 Dec 2018 14:29:41 +0100
Subject: l sqlBackup: fix permissions/folders

---
 lass/2configs/websites/sqlBackup.nix |  4 +---
 lass/3modules/mysql-backup.nix       | 16 ++++++++--------
 2 files changed, 9 insertions(+), 11 deletions(-)

(limited to 'lass/2configs/websites')

diff --git a/lass/2configs/websites/sqlBackup.nix b/lass/2configs/websites/sqlBackup.nix
index 897e35e61..10a6e4643 100644
--- a/lass/2configs/websites/sqlBackup.nix
+++ b/lass/2configs/websites/sqlBackup.nix
@@ -20,9 +20,7 @@
 
   lass.mysqlBackup = {
     enable = true;
-    config.all = {
-      password = toString (<secrets/mysql_rootPassword>);
-    };
+    config.all = {};
   };
 }
 
diff --git a/lass/3modules/mysql-backup.nix b/lass/3modules/mysql-backup.nix
index d2ae67171..516f96c34 100644
--- a/lass/3modules/mysql-backup.nix
+++ b/lass/3modules/mysql-backup.nix
@@ -41,7 +41,7 @@ let
           };
           location = mkOption {
             type = str;
-            default = "/bku/sql_dumps";
+            default = "/backups/sql_dumps";
           };
         };
       }));
@@ -51,11 +51,9 @@ let
 
   imp = {
 
-    #systemd.timers =
-    #  mapAttrs (_: plan: {
-    #  wantedBy = [ "timers.target" ];
-    #  timerConfig = plan.timerConfig;
-    #}) cfg.config;
+    services.mysql.ensureUsers = [
+      { ensurePermissions = { "*.*" = "ALL"; }; name = "root"; }
+    ];
 
     systemd.services =
       mapAttrs' (_: plan: nameValuePair "mysqlBackup-${plan.name}" {
@@ -75,8 +73,10 @@ let
 
 
   start = plan: let
-    backupScript = plan: db:
-      "mysqldump -u ${plan.user} ${optionalString (plan.password != null) "-p$(cat ${plan.password})"} ${db} | gzip -c > ${plan.location}/${db}.gz";
+    backupScript = plan: db: ''
+      mkdir -p ${plan.location}
+      mysqldump -u ${plan.user} ${optionalString (plan.password != null) "-p$(cat ${plan.password})"} ${db} | gzip -c > ${plan.location}/${db}.gz
+    '';
 
   in pkgs.pkgs.writeDash "mysqlBackup.${plan.name}" ''
     ${concatMapStringsSep "\n" (backupScript plan) plan.databases}
-- 
cgit v1.3.1