diff options
author | tv <tv@krebsco.de> | 2016-01-14 16:39:34 +0100 |
---|---|---|
committer | tv <tv@krebsco.de> | 2016-01-14 16:39:34 +0100 |
commit | 2ae2bdc586177f674a987e354940765ad86cbaa2 (patch) | |
tree | 0ba9baf9ff358a9eb2bb1111090d513b93268df7 /lass/1systems/mors.nix | |
parent | 780ddec4ab268fbfd43ea9bf511ed4b3b0d35783 (diff) | |
parent | 49b6fd9c87678893ed47794b116660700994b1bc (diff) |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'lass/1systems/mors.nix')
-rw-r--r-- | lass/1systems/mors.nix | 36 |
1 files changed, 31 insertions, 5 deletions
diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index 8af096f51..61f57f1f9 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -38,6 +38,10 @@ ../3modules/wordpress_nginx.nix ]; lass.wordpress."testserver.de" = { + multiSite = { + "1" = "testserver.de"; + "2" = "bla.testserver.de"; + }; }; services.mysql = { @@ -52,6 +56,27 @@ { predicate = "-i retiolum -p tcp --dport 80"; target = "ACCEPT"; precedence = 9998; } ]; } + { + #owncloud-test + #imports = singleton (sitesGenerators.createWordpress "testserver.de"); + imports = [ + ../3modules/owncloud_nginx.nix + ]; + lass.owncloud."owncloud-test.de" = { + }; + + #services.mysql = { + # enable = true; + # package = pkgs.mariadb; + # rootPassword = "<secrets>/mysql_rootPassword"; + #}; + networking.extraHosts = '' + 10.243.0.2 owncloud-test.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; @@ -59,11 +84,12 @@ networking.wireless.enable = true; networking.extraHosts = '' - 10.243.206.102 habsys.de - 10.243.206.102 pixelpocket.de - 10.243.206.102 karlaskop.de - 10.243.206.102 ubikmedia.de - 10.243.206.102 apanowicz.de + 213.239.205.240 wohnprojekt-rhh.de + 213.239.205.240 karlaskop.de + 213.239.205.240 makeup.apanowicz.de + 213.239.205.240 pixelpocket.de + 213.239.205.240 reich-gebaeudereinigung.de + 213.239.205.240 o.ubikmedia.de ''; hardware.enableAllFirmware = true; |