summaryrefslogtreecommitdiffstats
path: root/lass/1systems
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2015-12-26 10:43:15 +0100
committerlassulus <lass@aidsballs.de>2015-12-26 10:43:15 +0100
commitf55b44eb7cffbe0934785afd3a36001ba0713ad1 (patch)
tree2a7516b197d42b145c007fa2a354a46eceeebeca /lass/1systems
parentd7741ca83f8c3ebe8a283c3231a9bf17bf05d94c (diff)
l 1 mors: add wordpress/owncloud test
Diffstat (limited to 'lass/1systems')
-rw-r--r--lass/1systems/mors.nix36
1 files changed, 31 insertions, 5 deletions
diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index 4ba9df6f9..9b2200c58 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;