From 1d4ccb2c4d48bb510ea2cf22ff1b96fc887d8a00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Mon, 31 Dec 2018 16:13:10 +0100 Subject: Add www dir --- virtual/eldiron.nix | 19 +++-------- virtual/www/googleb6d69446ff4ca3e5.html | 1 + virtual/www/index.htm | 9 +++++ virtual/www/maintenance_immae.html | 58 +++++++++++++++++++++++++++++++++ virtual/www/nossl.html | 11 +++++++ 5 files changed, 83 insertions(+), 15 deletions(-) create mode 100644 virtual/www/googleb6d69446ff4ca3e5.html create mode 100644 virtual/www/index.htm create mode 100644 virtual/www/maintenance_immae.html create mode 100644 virtual/www/nossl.html diff --git a/virtual/eldiron.nix b/virtual/eldiron.nix index 0c71f87..d90e722 100644 --- a/virtual/eldiron.nix +++ b/virtual/eldiron.nix @@ -83,18 +83,6 @@ adminer = mypkgs.adminer.phpFpm.pool; connexionswing_dev = mypkgs.connexionswing_dev.phpFpm.pool; connexionswing_prod = mypkgs.connexionswing_prod.phpFpm.pool; - www = '' - listen = /var/run/phpfpm/www.sock - user = wwwrun - group = wwwrun - listen.owner = wwwrun - listen.group = wwwrun - pm = ondemand - pm.max_children = 5 - pm.process_idle_timeout = 60 - ;php_admin_flag[log_errors] = on - php_admin_value[open_basedir] = "/var/www" - ''; }; }; @@ -103,7 +91,6 @@ connexionswing_prod = mypkgs.connexionswing_prod.activationScript; httpd = '' install -d -m 0755 /var/lib/acme/acme-challenge - install -d -m 0755 /var/www ''; redis = '' mkdir -p /run/redis @@ -184,8 +171,10 @@ (withSSL "eldiron" // { listen = [ { ip = "*"; port = 443; } ]; hostName = "eldiron.immae.eu"; - # FIXME: directory needs to exist - documentRoot = "/var/www"; + documentRoot = ./www; + extraConfig = '' + DirectoryIndex index.htm + ''; }) (withSSL "eldiron" // { listen = [ { ip = "*"; port = 443; } ]; diff --git a/virtual/www/googleb6d69446ff4ca3e5.html b/virtual/www/googleb6d69446ff4ca3e5.html new file mode 100644 index 0000000..ff6dbf3 --- /dev/null +++ b/virtual/www/googleb6d69446ff4ca3e5.html @@ -0,0 +1 @@ +google-site-verification: googleb6d69446ff4ca3e5.html \ No newline at end of file diff --git a/virtual/www/index.htm b/virtual/www/index.htm new file mode 100644 index 0000000..0274251 --- /dev/null +++ b/virtual/www/index.htm @@ -0,0 +1,9 @@ + + + + Hello World HTML + + +

It works!

+ + diff --git a/virtual/www/maintenance_immae.html b/virtual/www/maintenance_immae.html new file mode 100644 index 0000000..90f265f --- /dev/null +++ b/virtual/www/maintenance_immae.html @@ -0,0 +1,58 @@ + + + + Maintenance + + + + + +

Erreur serveur ou maintenance en cours !

Une mise à jour ou une opération de maintenance est en cours sur le site. Retentez dans quelques instants ou patientez, la page se rechargera automatiquement.

+ +

Server error or website in maintenance!

An update or a maintenance is on track on the website. Please try again in a few seconds or wait, the page will reload automatically.

+ + diff --git a/virtual/www/nossl.html b/virtual/www/nossl.html new file mode 100644 index 0000000..4401a80 --- /dev/null +++ b/virtual/www/nossl.html @@ -0,0 +1,11 @@ + + + + No SSL site + + +

No SSL on this site

Use for wifi networks with login page that doesn't work well with + https.

+ + -- cgit v1.2.3