Différences

Ci-dessous, les différences entre deux révisions de la page.

--- admin:services:agir.chapril.org [2020/01/08 16:07] – admin
+++ admin:services:agir.chapril.org [2020/01/08 16:09] – admin
@@ Ligne 72: / Ligne 72: @@
     access_log /var/log/nginx/agir.chapril.org/agir.chapril.org.access_log;
     error_log /var/log/nginx/agir.chapril.org/agir.chapril.org.error_log;
-#    include /etc/nginx/custom_50x;
-    include /etc/nginx/acme-challenge;
-    include /etc/nginx/sexy-chapril;
-    include /etc/nginx/force-ssl.conf;
-}
-server {
-======= Service agir.chapril.org =======
-Redirection vers le projet Chapril dans le Redmine de l'April.
-===== Déploiement =====
-==== DNS ====
-Configuration du fichier DNS :
-<code>
-=(^-^)=root@dns:/etc/bind/zones/masters# git diff
-diff --git a/bind/zones/masters/chapril.org b/bind/zones/masters/chapril.org
-index a5368c5..cb20fcd 100644
---- a/bind/zones/masters/chapril.org
-+++ b/bind/zones/masters/chapril.org
-@@ -3,7 +3,7 @@
- $TTL 1h
- @      IN      SOA     fip.chapril.org.        hostmaster.chapril.org. (
--               2019110400              ; Serial  - YYYYMMDDnn
-+               2020010801              ; Serial  - YYYYMMDDnn
-h                      ; Refresh
-h                      ; Retry
-w                      ; Expire
-@@ -50,6 +50,10 @@ icinga2 CNAME galanga.april.org.
- backup  CNAME   icinga2
- myip    CNAME   icinga2
-+; redirections
-+agir    CNAME   fip
-+wiki    CNAME   fip
-+
- ; XMPP (old)
- muc.xmpp    CNAME   xmpp
- echo.xmpp   CNAME   xmpp
-</code>
-Activation :
-<code>
-rndc reload chapril.org in external
-</code>
-==== Bastion ====
-Configuration du certificat SSL :
-<code>
-=(^-^)=root@bastion:/etc# git diff dehydrated/domains.txt
-diff --git a/dehydrated/domains.txt b/dehydrated/domains.txt
-index b53ff9c..662eb8a 100644
---- a/dehydrated/domains.txt
-+++ b/dehydrated/domains.txt
-@@ -15,3 +15,5 @@ pad.chapril.org
- valise.chapril.org
- xmpp.chapril.org upload-xmpp.chapril.org
- drop.chapril.org
-+agir.chapril.org
-+wiki.chapril.org
-</code>
-Activation :
-<code>
-dehydrated -c
-</code>
-Configuration du serveur web sur la vm bastion :
-<code>
-=(^-^)=root@bastion:/etc/nginx/sites-available# cat wiki.chapril.org
-server {
-    listen 80;
-    listen [::]:80;
-    server_name wiki.chapril.org;
-    access_log /var/log/nginx/wiki.chapril.org/wiki.chapril.org.access_log;
-    error_log /var/log/nginx/wiki.chapril.org/wiki.chapril.org.error_log;
 #    include /etc/nginx/custom_50x;
@@ Ligne 169: / Ligne 85: @@
     ssl on;
-    server_name wiki.chapril.org;
+    server_name agir.chapril.org;
-    access_log /var/log/nginx/wiki.chapril.org/wiki.chapril.org.access_log;
+    access_log /var/log/nginx/agir.chapril.org/agir.chapril.org.access_log;
-    error_log /var/log/nginx/wiki.chapril.org/wiki.chapril.org.error_log;
+    error_log /var/log/nginx/agir.chapril.org/agir.chapril.org.error_log;
 #    include /etc/nginx/custom_50x;
-    ssl_certificate     /var/lib/dehydrated/certs/wiki.chapril.org/fullchain.pem;
+    ssl_certificate     /var/lib/dehydrated/certs/agir.chapril.org/fullchain.pem;
-    ssl_certificate_key /var/lib/dehydrated/certs/wiki.chapril.org/privkey.pem;
+    ssl_certificate_key /var/lib/dehydrated/certs/agir.chapril.org/privkey.pem;
     include /etc/nginx/acme-challenge;
     include /etc/nginx/sexy-chapril;
-    return 301 https://wiki.april.org/w/Chapril;
+    return 301 https://agir.april.org/projects/chapril/issues;
 }
 </code>