summaryrefslogtreecommitdiffstats
path: root/lass/1systems/mors.nix
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2015-11-14 01:51:36 +0100
committermakefu <github@syntax-fehler.de>2015-11-14 01:51:36 +0100
commit773a67a983cbe1928da6c524db24a25229a6f5fe (patch)
tree2a00ed5a39f85b837578625cf49d193f4d308f14 /lass/1systems/mors.nix
parenta0fbe917ac45cda4de0f16bced3ce3ebfc556fe8 (diff)
parente7d22252dcad25fd5594e9a431f5a39aa620906d (diff)
Merge remote-tracking branch 'cloudkrebs/master' into pre-merge
Diffstat (limited to 'lass/1systems/mors.nix')
-rw-r--r--lass/1systems/mors.nix29
1 files changed, 28 insertions, 1 deletions
diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index 7db3f8333..7b91fa6be 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -18,10 +18,37 @@
../2configs/chromium-patched.nix
../2configs/git.nix
../2configs/retiolum.nix
- ../2configs/wordpress.nix
+ #../2configs/wordpress.nix
../2configs/bitlbee.nix
../2configs/firefoxPatched.nix
../2configs/skype.nix
+ {
+ #risk of rain port
+ krebs.iptables.tables.filter.INPUT.rules = [
+ { predicate = "-p tcp --dport 11100"; target = "ACCEPT"; }
+ ];
+ }
+ {
+ #wordpress-test
+ #imports = singleton (sitesGenerators.createWordpress "testserver.de");
+ imports = [
+ ../3modules/wordpress_nginx.nix
+ ];
+ lass.wordpress."testserver.de" = {
+ };
+
+ services.mysql = {
+ enable = true;
+ package = pkgs.mariadb;
+ rootPassword = "<secrets>/mysql_rootPassword";
+ };
+ networking.extraHosts = ''
+ 10.243.0.2 testserver.de
+ '';
+ krebs.iptables.tables.filter.INPUT.rules = [
+ { predicate = "-i retiolum -p tcp --dport 80"; target = "ACCEPT"; precedence = 9998; }
+ ];
+ }
];
krebs.build.host = config.krebs.hosts.mors;