diff options
| author | jeschli <jeschli@gmail.com> | 2018-12-28 14:48:30 +0100 |
|---|---|---|
| committer | jeschli <jeschli@gmail.com> | 2018-12-28 14:48:30 +0100 |
| commit | 06b6454af78e8236a67d69cab94f62c32054be47 (patch) | |
| tree | 749fd6025d2e799314cf46d51027dc23fb19c7b8 /lass/2configs/websites | |
| parent | 8605ac91ae3a3859ab906a5fa2e9b0e3dfcd6e1e (diff) | |
| parent | fb254e60949f029cc7cb48764093b49932d0acde (diff) | |
Merge branch 'master' of prism.r:stockholm
Diffstat (limited to 'lass/2configs/websites')
| -rw-r--r-- | lass/2configs/websites/domsen.nix | 1 | ||||
| -rw-r--r-- | lass/2configs/websites/lassulus.nix | 3 | ||||
| -rw-r--r-- | lass/2configs/websites/sqlBackup.nix | 4 |
3 files changed, 5 insertions, 3 deletions
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"; 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; ''; 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 = {}; }; } |