From 63ef87433085f10a874146bdeffb38abf17ea39f Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sat, 1 Oct 2016 02:52:35 +0200
Subject: l 3 umts: remove obsolete comments

---
 lass/3modules/umts.nix | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'lass/3modules')

diff --git a/lass/3modules/umts.nix b/lass/3modules/umts.nix
index 01adc0409..7daaba89e 100644
--- a/lass/3modules/umts.nix
+++ b/lass/3modules/umts.nix
@@ -41,10 +41,6 @@ let
 
   wvdial = nixpkgs-1509.wvdial; # https://github.com/NixOS/nixpkgs/issues/16113
 
-  #modem-device = "/dev/serial/by-id/usb-Lenovo_F5521gw_38214921FBBBC7B0-if09";
-  modem-device = "/dev/serial/by-id/usb-HUAWEI_Technologies_HUAWEI_Mobile-if00-port0";
-
-  # TODO: currently it is only netzclub
   umts-bin = pkgs.writeScriptBin "umts" ''
     #!/bin/sh
     set -euf
-- 
cgit v1.2.3


From b6c5994e037ab92055f5cfdeb89f46864b348b39 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Tue, 11 Oct 2016 17:51:22 +0200
Subject: l 3: add hosts.nix

---
 lass/3modules/default.nix |  1 +
 lass/3modules/hosts.nix   | 12 ++++++++++++
 2 files changed, 13 insertions(+)
 create mode 100644 lass/3modules/hosts.nix

(limited to 'lass/3modules')

diff --git a/lass/3modules/default.nix b/lass/3modules/default.nix
index 6e1e20dd3..6588ca0d3 100644
--- a/lass/3modules/default.nix
+++ b/lass/3modules/default.nix
@@ -3,6 +3,7 @@ _:
   imports = [
     ./ejabberd
     ./folderPerms.nix
+    ./hosts.nix
     ./mysql-backup.nix
     ./umts.nix
     ./urxvtd.nix
diff --git a/lass/3modules/hosts.nix b/lass/3modules/hosts.nix
new file mode 100644
index 000000000..f2ff10c06
--- /dev/null
+++ b/lass/3modules/hosts.nix
@@ -0,0 +1,12 @@
+{ config, ... }:
+
+with config.krebs.lib;
+
+{
+  options.lass.hosts = mkOption {
+    type = types.attrsOf types.host;
+    default =
+      filterAttrs (_: host: host.owner.name == "lass")
+      config.krebs.hosts;
+  };
+}
-- 
cgit v1.2.3


From 76a2187972ca8c0b7566aba78affdd032d8a1343 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Wed, 12 Oct 2016 12:14:57 +0200
Subject: remove comments from php config, phpfpm error

---
 lass/3modules/owncloud_nginx.nix  | 1 -
 lass/3modules/wordpress_nginx.nix | 1 -
 2 files changed, 2 deletions(-)

(limited to 'lass/3modules')

diff --git a/lass/3modules/owncloud_nginx.nix b/lass/3modules/owncloud_nginx.nix
index 35d8d04a5..4a79311a4 100644
--- a/lass/3modules/owncloud_nginx.nix
+++ b/lass/3modules/owncloud_nginx.nix
@@ -111,7 +111,6 @@ let
       pm.max_spare_servers = 3
       listen.owner = ${user}
       listen.group = ${group}
-      # errors to journal
       php_admin_value[error_log] = 'stderr'
       php_admin_flag[log_errors] = on
       catch_workers_output = yes
diff --git a/lass/3modules/wordpress_nginx.nix b/lass/3modules/wordpress_nginx.nix
index 108054cb6..4305a121b 100644
--- a/lass/3modules/wordpress_nginx.nix
+++ b/lass/3modules/wordpress_nginx.nix
@@ -154,7 +154,6 @@ let
       pm.max_spare_servers = 3
       listen.owner = ${user}
       listen.group = ${group}
-      # errors to journal
       php_admin_value[error_log] = 'stderr'
       php_admin_flag[log_errors] = on
       catch_workers_output = yes
-- 
cgit v1.2.3