aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2018-12-31 16:13:10 +0100
committerIsmaël Bouya <ismael.bouya@normalesup.org>2019-01-01 18:16:26 +0100
commit1d4ccb2c4d48bb510ea2cf22ff1b96fc887d8a00 (patch)
tree66494ac1bd4b8211df3fdc3f1d8b3a2265d34ebc
parent5f3e023d3b5dd48b6024c7cea8a61cfdb1019b38 (diff)
downloadNix-1d4ccb2c4d48bb510ea2cf22ff1b96fc887d8a00.tar.gz
Nix-1d4ccb2c4d48bb510ea2cf22ff1b96fc887d8a00.tar.zst
Nix-1d4ccb2c4d48bb510ea2cf22ff1b96fc887d8a00.zip
Add www dir
-rw-r--r--virtual/eldiron.nix19
-rw-r--r--virtual/www/googleb6d69446ff4ca3e5.html1
-rw-r--r--virtual/www/index.htm9
-rw-r--r--virtual/www/maintenance_immae.html58
-rw-r--r--virtual/www/nossl.html11
5 files changed, 83 insertions, 15 deletions
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 @@
83 adminer = mypkgs.adminer.phpFpm.pool; 83 adminer = mypkgs.adminer.phpFpm.pool;
84 connexionswing_dev = mypkgs.connexionswing_dev.phpFpm.pool; 84 connexionswing_dev = mypkgs.connexionswing_dev.phpFpm.pool;
85 connexionswing_prod = mypkgs.connexionswing_prod.phpFpm.pool; 85 connexionswing_prod = mypkgs.connexionswing_prod.phpFpm.pool;
86 www = ''
87 listen = /var/run/phpfpm/www.sock
88 user = wwwrun
89 group = wwwrun
90 listen.owner = wwwrun
91 listen.group = wwwrun
92 pm = ondemand
93 pm.max_children = 5
94 pm.process_idle_timeout = 60
95 ;php_admin_flag[log_errors] = on
96 php_admin_value[open_basedir] = "/var/www"
97 '';
98 }; 86 };
99 }; 87 };
100 88
@@ -103,7 +91,6 @@
103 connexionswing_prod = mypkgs.connexionswing_prod.activationScript; 91 connexionswing_prod = mypkgs.connexionswing_prod.activationScript;
104 httpd = '' 92 httpd = ''
105 install -d -m 0755 /var/lib/acme/acme-challenge 93 install -d -m 0755 /var/lib/acme/acme-challenge
106 install -d -m 0755 /var/www
107 ''; 94 '';
108 redis = '' 95 redis = ''
109 mkdir -p /run/redis 96 mkdir -p /run/redis
@@ -184,8 +171,10 @@
184 (withSSL "eldiron" // { 171 (withSSL "eldiron" // {
185 listen = [ { ip = "*"; port = 443; } ]; 172 listen = [ { ip = "*"; port = 443; } ];
186 hostName = "eldiron.immae.eu"; 173 hostName = "eldiron.immae.eu";
187 # FIXME: directory needs to exist 174 documentRoot = ./www;
188 documentRoot = "/var/www"; 175 extraConfig = ''
176 DirectoryIndex index.htm
177 '';
189 }) 178 })
190 (withSSL "eldiron" // { 179 (withSSL "eldiron" // {
191 listen = [ { ip = "*"; port = 443; } ]; 180 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 @@
1<!DOCTYPE html>
2<html>
3 <head>
4 <title>Hello World HTML</title>
5 </head>
6 <body>
7 <h1>It works!</h1>
8 </body>
9</html>
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 @@
1<!doctype html>
2<html>
3 <head>
4 <title>Maintenance</title>
5 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
6 <style>
7 body {
8 padding-left: 5px;
9 padding-right: 5px;
10 text-align: center;
11 margin: auto;
12 font: 20px Helvetica, sans-serif;
13 color: #333;
14 }
15 h1 {
16 margin: 0px;
17 font-size: 40px;
18 }
19 article {
20 display: block;
21 max-width: 650px;
22 margin: 0 auto;
23 padding-top: 30px;
24 }
25 article + article {
26 border-top: 1px solid lightgrey;
27 }
28 article div {
29 text-align: justify;
30 }
31 a {
32 color: #dc8100;
33 text-decoration: none;
34 }
35 a:hover {
36 color: #333;
37 }
38 </style>
39 <script type="text/javascript">
40 setTimeout(function () { location.reload(true); }, 5000);
41 </script>
42 </head>
43 <body>
44 <article>
45 <h1>Erreur serveur ou maintenance en cours&nbsp;!</h1>
46 <div>
47 <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>
48 </div>
49 </article>
50
51 <article>
52 <h1>Server error or website in maintenance!</h1>
53 <div>
54 <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>
55 </div>
56 </article>
57 </body>
58</html>
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 @@
1<!DOCTYPE html>
2<html>
3 <head>
4 <title>No SSL site</title>
5 </head>
6 <body>
7 <h1>No SSL on this site</h1>
8 <p>Use for wifi networks with login page that doesn't work well with
9 https.</p>
10 </body>
11</html>