From edba35fea979ba470d7b802bbf3a69749f37b5de Mon Sep 17 00:00:00 2001
From: =?utf8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Sun, 5 Jan 2020 20:18:32 +0100
Subject: [PATCH] Add discourse capitaine landing page

---
 .../private/monitoring/objects_immae-eu.nix   |   5 ---
 .../capitaines/discourse_static/discourse.png | Bin 0 -> 2440 bytes
 .../capitaines/discourse_static/index.html    |  28 +++++++++++++++
 .../websites/capitaines/production.nix        |  34 +++++++++++++-----
 4 files changed, 54 insertions(+), 13 deletions(-)
 create mode 100644 modules/private/websites/capitaines/discourse_static/discourse.png
 create mode 100644 modules/private/websites/capitaines/discourse_static/index.html

diff --git a/modules/private/monitoring/objects_immae-eu.nix b/modules/private/monitoring/objects_immae-eu.nix
index 3dda999..a1d1adb 100644
--- a/modules/private/monitoring/objects_immae-eu.nix
+++ b/modules/private/monitoring/objects_immae-eu.nix
@@ -110,11 +110,6 @@ in
     }
 
     #### Web scenarios
-    {
-      service_description = "discourse website is running on discourse.capitaines.fr";
-      freshness_threshold = "1800";
-    }
-
     {
       service_description = "Default website site is running on ns208507.ip-188-165-209.eu";
       freshness_threshold = "1800";
diff --git a/modules/private/websites/capitaines/discourse_static/discourse.png b/modules/private/websites/capitaines/discourse_static/discourse.png
new file mode 100644
index 0000000000000000000000000000000000000000..91ce42d50db9f2a53e0e656fe77e492e60872739
GIT binary patch
literal 2440
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

literal 0
HcmV?d00001

diff --git a/modules/private/websites/capitaines/discourse_static/index.html b/modules/private/websites/capitaines/discourse_static/index.html
new file mode 100644
index 0000000..4c2ead0
--- /dev/null
+++ b/modules/private/websites/capitaines/discourse_static/index.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html lang='en'>
+  <head>
+    <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'>
+    <title>This instance is now closed - Discourse</title>
+    <style>
+      body {
+        text-align: center;
+        background: #f9f9f9;
+        font-family: sans-serif;
+      }
+      img {
+        max-width: 235px;
+        width: 100%;
+      }
+      h1 {
+        font-size: 20px;
+        font-weight: 400;
+      }
+    </style>
+  </head>
+  <body>
+    <div>
+      <img alt='Discourse capitaines' src='/discourse.png'>
+      <h1>Sorry, this instance is closed now.</h1>
+    </div>
+  </body>
+</html>
diff --git a/modules/private/websites/capitaines/production.nix b/modules/private/websites/capitaines/production.nix
index 044ff1d..ee1698b 100644
--- a/modules/private/websites/capitaines/production.nix
+++ b/modules/private/websites/capitaines/production.nix
@@ -1,17 +1,15 @@
 { lib, pkgs, config,  ... }:
 let
-    cfg = config.myServices.websites.capitaines.production;
-    env = config.myEnv.websites.capitaines;
-    webappName = "capitaines_mastodon";
-    root = "/run/current-system/webapps/${webappName}";
-    siteDir = ./mastodon_static;
+  cfg = config.myServices.websites.capitaines.production;
+  env = config.myEnv.websites.capitaines;
 in {
   options.myServices.websites.capitaines.production.enable = lib.mkEnableOption "enable Capitaines's website";
 
   config = lib.mkIf cfg.enable {
-    myServices.websites.webappDirs."${webappName}" = siteDir;
-
-    services.websites.env.production.vhostConfs.capitaines_mastodon = {
+    myServices.websites.webappDirs.capitaines_mastodon = ./mastodon_static;
+    services.websites.env.production.vhostConfs.capitaines_mastodon = let
+      root = "/run/current-system/webapps/capitaines_mastodon";
+    in {
       certName     = "capitaines";
       certMainHost = "mastodon.capitaines.fr";
       hosts        = [ "mastodon.capitaines.fr" ];
@@ -28,6 +26,26 @@ in {
       ];
     };
 
+    myServices.websites.webappDirs.capitaines_discourse = ./discourse_static;
+    services.websites.env.production.vhostConfs.capitaines_discourse = let
+      root = "/run/current-system/webapps/capitaines_discourse";
+    in {
+      certName     = "capitaines";
+      addToCerts   = true;
+      hosts        = [ "discourse.capitaines.fr" ];
+      root         = root;
+      extraConfig  = [
+        ''
+        ErrorDocument 404 /index.html
+        <Directory ${root}>
+          DirectoryIndex index.html
+          Options Indexes FollowSymLinks MultiViews Includes
+          Require all granted
+        </Directory>
+          ''
+      ];
+    };
+
     services.websites.env.production.vhostConfs.capitaines = {
       certName   = "capitaines";
       addToCerts = true;
-- 
2.41.0