]> git.immae.eu Git - perso/Immae/Config/Nix.git/commitdiff
projects / perso / Immae / Config / Nix.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5f3e023)
Add www dir
authorIsmaël Bouya <ismael.bouya@normalesup.org>
Mon, 31 Dec 2018 15:13:10 +0000 (16:13 +0100)
committerIsmaël Bouya <ismael.bouya@normalesup.org>
Tue, 1 Jan 2019 17:16:26 +0000 (18:16 +0100)
virtual/eldiron.nix patch | blob | blame | history
virtual/www/googleb6d69446ff4ca3e5.html [new file with mode: 0644] patch | blob
virtual/www/index.htm [new file with mode: 0644] patch | blob
virtual/www/maintenance_immae.html [new file with mode: 0644] patch | blob
virtual/www/nossl.html [new file with mode: 0644] patch | blob

diff --git a/virtual/eldiron.nix b/virtual/eldiron.nix
index 0c71f87b78c2f1fdd45dd5f8e15e1c7ce89254f7..d90e722d13f3b1ecda60b05154deed18ff576bd8 100644 (file)
--- 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 (file)
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 (file)
index 0000000..0274251
--- /dev/null
+++ b/virtual/www/index.htm
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Hello World HTML</title>
+  </head>
+  <body>
+    <h1>It works!</h1>
+  </body>
+</html>
diff --git a/virtual/www/maintenance_immae.html b/virtual/www/maintenance_immae.html
new file mode 100644 (file)
index 0000000..90f265f
--- /dev/null
+++ b/virtual/www/maintenance_immae.html
@@ -0,0 +1,58 @@
+<!doctype html>
+<html>
+  <head>
+    <title>Maintenance</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <style>
+      body {
+        padding-left: 5px;
+        padding-right: 5px;
+        text-align: center;
+        margin: auto;
+        font: 20px Helvetica, sans-serif;
+        color: #333;
+      }
+      h1 {
+        margin: 0px;
+        font-size: 40px;
+      }
+      article {
+        display: block;
+        max-width: 650px;
+        margin: 0 auto;
+        padding-top: 30px;
+      }
+      article + article {
+        border-top: 1px solid lightgrey;
+      }
+      article div {
+        text-align: justify;
+      }
+      a {
+        color: #dc8100;
+        text-decoration: none;
+      }
+      a:hover {
+        color: #333;
+      }
+    </style>
+    <script type="text/javascript">
+      setTimeout(function () { location.reload(true); }, 5000);
+    </script>
+  </head>
+  <body>
+    <article>
+      <h1>Erreur serveur ou maintenance en cours&nbsp;!</h1>
+      <div>
+        <p>Une mise à jour ou une opération de maintenance est en cours sur le site. <a href="">Retentez</a> dans quelques instants ou patientez, la page se rechargera automatiquement.</p>
+      </div>
+    </article>
+
+    <article>
+      <h1>Server error or website in maintenance!</h1>
+      <div>
+        <p>An update or a maintenance is on track on the website. Please try <a href="">again</a> in a few seconds or wait, the page will reload automatically.</p>
+      </div>
+    </article>
+  </body>
+</html>
diff --git a/virtual/www/nossl.html b/virtual/www/nossl.html
new file mode 100644 (file)
index 0000000..4401a80
--- /dev/null
+++ b/virtual/www/nossl.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>No SSL site</title>
+  </head>
+  <body>
+    <h1>No SSL on this site</h1>
+    <p>Use for wifi networks with login page that doesn't work well with
+    https.</p>
+  </body>
+</html>
My infrastructure configuration