From 1759f7987ef4fad6ad681e0a072a250054dc2843 Mon Sep 17 00:00:00 2001
From: LUXEY Adrien <adrien.luxey@inria.fr>
Date: Sun, 11 Apr 2021 17:05:18 +0200
Subject: [PATCH] rewrote parts of the OS install guide

---
 bootstrapper/os_install/README.md             | 34 +++++++++++++++++--
 .../templates/gitea/docker-compose.yml.j2     |  1 -
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/bootstrapper/os_install/README.md b/bootstrapper/os_install/README.md
index 7809cdb..20524c9 100644
--- a/bootstrapper/os_install/README.md
+++ b/bootstrapper/os_install/README.md
@@ -207,10 +207,22 @@ We use GPT partition table layout (without UEFI), which demands a small `bios_gr
 
 * Fill in network-related files
 
-    Beware of your ethernet interface name! It's only after failing with `eth0` that the boot logs informed me that the iface name was `eno1`.
+    `/etc/sysctl.d/10-ipv6`
+
+    Disable IPv6 auto-configuration
+
+    ```bash
+    cat << EOF > /etc/sysctl.d/10-ipv6
+    net.ipv6.conf.all.autoconf=0
+    net.ipv6.conf.all.accept_ra=0
+    EOF
+    ```
+
 
     `/etc/network/interfaces`
 
+    Beware of your ethernet interface name! It's only after failing with `eth0` that the boot logs informed me that the iface name was `eno1`.
+
     ```bash
     cat << EOF > /etc/network/interfaces
     ######################################################################
@@ -223,12 +235,28 @@ We use GPT partition table layout (without UEFI), which demands a small `bios_gr
     auto lo
     iface lo inet loopback
 
-    # eno1 through DHCP
+    # eno1 
     auto eno1
-    iface eno1 inet dhcp
+    allow-hotplug eno1
+
+    iface eno1 inet static 
+        address 5.135.179.11
+        netmask 255.255.255.0
+        gateway 5.135.179.254
+
+    iface eno1 inet6 static 
+        address 2001:41d0:8:ba0b::1
+        netmask 128
+
+    post-up /sbin/ip -f inet6 route add 2001:41d0:8:baff:ff:ff:ff:ff dev eno1 
+    post-up /sbin/ip -f inet6 route add default via 2001:41d0:8:baff:ff:ff:ff:ff 
+    pre-down /sbin/ip -f inet6 route del 2001:41d0:8:baff:ff:ff:ff:ff dev eno1
+    pre-down /sbin/ip -f inet6 route del default via 2001:41d0:8:baff:ff:ff:ff:ff
     EOF
     ```
 
+    [This OVH IPv6 guide](https://docs.ovh.com/gb/en/dedicated/network-ipv6/) might help you out for the IPv6 part.
+
     `/etc/resolv.conf`
 
     ```bash
diff --git a/deployer/roles/build/templates/gitea/docker-compose.yml.j2 b/deployer/roles/build/templates/gitea/docker-compose.yml.j2
index 52c437f..9c5e462 100644
--- a/deployer/roles/build/templates/gitea/docker-compose.yml.j2
+++ b/deployer/roles/build/templates/gitea/docker-compose.yml.j2
@@ -6,7 +6,6 @@ version: '3'
 
 services:
   site:
-    # build: site
     image: gitea/gitea:{{ gitea.version }}
     restart: always
     environment: