From c8d089d22fef5835e030906a51ff4be0ab528edb Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 29 Aug 2016 10:58:11 +0200 Subject: l 1 mors: import krebs.lib --- lass/1systems/mors.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'lass/1systems') diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index d3878d30..228c76e2 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -1,5 +1,6 @@ { config, pkgs, ... }: +with config.krebs.lib; { imports = [ ../. -- cgit v1.2.3 From de849cd88c97f55a66a74a9aaca6cb6571dc25e2 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 29 Aug 2016 10:58:46 +0200 Subject: l 1 mors: enable public_html --- lass/1systems/mors.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'lass/1systems') diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index 228c76e2..2f429994 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -67,6 +67,16 @@ with config.krebs.lib; ''; }; } + { + krebs.nginx = { + enable = true; + servers.default.locations = [ + (nameValuePair "~ ^/~(.+?)(/.*)?\$" '' + alias /home/$1/public_html$2; + '') + ]; + }; + } ]; krebs.build.host = config.krebs.hosts.mors; -- cgit v1.2.3 From 62741d32f5d0ee57ee7e3988c512cb48cf2cfb63 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 29 Aug 2016 10:59:03 +0200 Subject: l 1 mors: add pkgs.logf --- lass/1systems/mors.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lass/1systems') diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index 2f429994..1ab33e94 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -190,6 +190,8 @@ with config.krebs.lib; urban mk_sql_pair remmina + + logf ]; #TODO: fix this shit -- cgit v1.2.3 From 3d69e1ca47f8eaff51205c4dc0c3d79e8becec21 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 31 Aug 2016 08:44:43 +0200 Subject: l 1 prism: enable public_html on port 8088 --- lass/1systems/prism.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'lass/1systems') diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix index 47e8a68b..c7c76530 100644 --- a/lass/1systems/prism.nix +++ b/lass/1systems/prism.nix @@ -243,6 +243,23 @@ in { ]; }; } + { + krebs.nginx = { + enable = true; + servers.public = { + listen = [ "8088" ]; + server-names = [ "default" ]; + locations = [ + (nameValuePair "~ ^/~(.+?)(/.*)?\$" '' + alias /home/$1/public_html$2; + '') + ]; + }; + }; + krebs.iptables.tables.filter.INPUT.rules = [ + { predicate = "-p tcp --dport 8088"; target = "ACCEPT"; } + ]; + } ]; krebs.build.host = config.krebs.hosts.prism; -- cgit v1.2.3 From 9cccda22a1af9ba96ede7b1c0e42e327d0af5807 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 3 Sep 2016 03:00:51 +0200 Subject: l 1 mors: add exfat to pkgs --- lass/1systems/mors.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lass/1systems') diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index 1ab33e94..1aa4d9b2 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -181,6 +181,8 @@ with config.krebs.lib; ''; environment.systemPackages = with pkgs; [ + exfat + acronym cac-api sshpass -- cgit v1.2.3