Merge branch 'master' into contact_gpg

2021-02-13 04:57:20 +00:00 · 2021-02-13 04:57:20 +00:00 · 611ac540c4
parent 9c3f317367 027fec6c0f
commit 611ac540c4
11 changed files with 21 additions and 28 deletions
--- a/pages/01.home/_services/services.de.md
+++ b/pages/01.home/_services/services.de.md
@ -104,7 +104,7 @@ services:
        text: "A low latency, high quality voice chat application."
        button: 'https://mumble.disroot.org'
        buttontext: "Log in"
-        badge: EXPERIMENTAL
+        #badge: EXPERIMENTAL
    -
        title: 'Cryptpad'
        icon: cryptpad.png
@ -112,5 +112,5 @@ services:
        text: "A private-by-design alternative to popular office tools."
        button: 'https://cryptpad.disroot.org'
        buttontext: "Access"
-        badge: EXPERIMENTAL
+        #badge: EXPERIMENTAL
 ---
--- a/pages/01.home/_services/services.en.md
+++ b/pages/01.home/_services/services.en.md
@ -104,7 +104,7 @@ services:
        text: "A low latency, high quality voice chat application."
        button: 'https://mumble.disroot.org'
        buttontext: "Log in"
-        badge: EXPERIMENTAL
+        #badge: EXPERIMENTAL
    -
        title: 'Cryptpad'
        icon: cryptpad.png
@ -112,5 +112,5 @@ services:
        text: "A private-by-design alternative to popular office tools."
        button: 'https://cryptpad.disroot.org'
        buttontext: "Access"
-        badge: EXPERIMENTAL
+        #badge: EXPERIMENTAL
 ---
--- a/pages/01.home/_services/services.es.md
+++ b/pages/01.home/_services/services.es.md
@ -104,7 +104,7 @@ services:
        text: "Herramienta de audio chat."
        button: 'https://mumble.disroot.org'
        buttontext: "Conéctate"
-        badge: EXPERIMENTAL
+        #badge: EXPERIMENTAL
    -
        title: 'CryptPad'
        icon: cryptpad.png
@ -112,5 +112,5 @@ services:
        text: "Herramientas de oficina privadas-por-defecto."
        button: 'https://cryptpad.disroot.org'
        buttontext: "Accede"
-        badge: EXPERIMENTAL
+        #badge: EXPERIMENTAL
 ---
--- a/pages/01.home/_services/services.fr.md
+++ b/pages/01.home/_services/services.fr.md
@ -104,7 +104,7 @@ services:
        text: "Une application de chat vocal à faible latence et de haute qualité."
        button: 'https://mumble.disroot.org'
        buttontext: "Créer une chaîne"
-        badge: EXPERIMENTAL
+        #badge: EXPERIMENTAL
    -
        title: 'Cryptpad'
        icon: cryptpad.png
@ -112,13 +112,5 @@ services:
        text: "Une alternative privée aux outils de bureautique populaires."
        button: 'https://cryptpad.disroot.org'
        buttontext: "Accès"
-        badge: EXPERIMENTAL
-    -
-        title: 'Games'
-        icon: game.png
-        link: 'https://disroot.org/en/quarantine'
-        text: "Un serveur de jeu pour s'amuser!"
-        button: 'https://disroot.org/en/quarantine'
-        buttontext: "Plus d'info"
-        badge: NOUVEAU
+        #badge: 
 ---
--- a/pages/01.home/_services/services.it.md
+++ b/pages/01.home/_services/services.it.md
@ -104,7 +104,7 @@ services:
        text: "A low latency, high quality voice chat application."
        button: 'https://mumble.disroot.org'
        buttontext: "Log in"
-        badge: EXPERIMENTAL
+        #badge: EXPERIMENTAL
    -
        title: 'Cryptpad'
        icon: cryptpad.png
@ -112,5 +112,5 @@ services:
        text: "A private-by-design alternative to popular office tools."
        button: 'https://cryptpad.disroot.org'
        buttontext: "Access"
-        badge: EXPERIMENTAL
+        #badge: EXPERIMENTAL
 ---
--- a/pages/01.home/_services/services.ru.md
+++ b/pages/01.home/_services/services.ru.md
@ -104,7 +104,7 @@ services:
        text: "Голосовой чат с низкой задержкой и хорошим качеством звука."
        button: 'https://mumble.disroot.org'
        buttontext: "Войти"
-        badge: EXPERIMENTAL
+        #badge: EXPERIMENTAL
    -
        title: 'Cryptpad'
        icon: cryptpad.png
@ -112,5 +112,5 @@ services:
        text: "Альтернатива популярным офисным приложениям с акцентом на приватность."
        button: 'https://cryptpad.disroot.org'
        buttontext: "Начать"
-        badge: EXPERIMENTAL
+        #badge: EXPERIMENTAL
 ---
--- a/pages/11.covid19/_services/services.en.md
+++ b/pages/11.covid19/_services/services.en.md
@ -54,7 +54,7 @@ services:
        text: "A low latency, high quality voice chat application."
        button: 'https://mumble.disroot.org'
        buttontext: "Create a channel"
-        badge: EXPERIMENTAL
+        #badge: EXPERIMENTAL
    -
        title: 'Cryptpad'
        icon: cryptpad.png
@ -62,7 +62,7 @@ services:
        text: "A private-by-design alternative to popular office tools."
        button: 'https://cryptpad.disroot.org'
        buttontext: "Access"
-        badge: EXPERIMENTAL
+        #badge: EXPERIMENTAL
    -
        title: 'Games'
        icon: game.png
--- a/pages/11.covid19/_services/services.es.md
+++ b/pages/11.covid19/_services/services.es.md
@ -54,7 +54,7 @@ services:
        text: "Aplicación de audio chat con alta calidad de sonido y baja latencia"
        button: 'https://mumble.disroot.org'
        buttontext: "Crea un canal"
-        badge: EXPERIMENTAL
+        #badge: EXPERIMENTAL
    -
        title: 'CryptPad'
        icon: cryptpad.png
@ -62,7 +62,7 @@ services:
        text: "Alternativa privada-por-defecto a herramientas ofimáticas populares"
        button: 'https://cryptpad.disroot.org'
        buttontext: "Access"
-        badge: EXPERIMENTAL
+        #badge: EXPERIMENTAL
    -
        title: 'Juegos'
        icon: game.png
--- a/pages/11.covid19/_services/services.fr.md
+++ b/pages/11.covid19/_services/services.fr.md
@ -54,7 +54,7 @@ services:
        text: "Une application de chat vocal à faible latence et de haute qualité."
        button: 'https://mumble.disroot.org'
        buttontext: "Créer une chaîne"
-        badge: EXPERIMENTAL
+        #badge: EXPERIMENTAL
    -
        title: 'Cryptpad'
        icon: cryptpad.png
@ -62,7 +62,7 @@ services:
        text: "Une alternative privée aux outils de bureautique populaires."
        button: 'https://cryptpad.disroot.org'
        buttontext: "Accès"
-        badge: EXPERIMENTAL
+        #badge: EXPERIMENTAL
    -
        title: 'Games'
        icon: game.png
--- a/pages/11.covid19/_services/services.it.md
+++ b/pages/11.covid19/_services/services.it.md
@ -54,7 +54,7 @@ services:
        text: "Una applicazione per audio chat"
        button: 'https://mumble.disroot.org'
        buttontext: "Crea un canale"
-        badge: SPERIMENTALE
+        #badge: SPERIMENTALE
    -
        title: 'Cryptpad'
        icon: cryptpad.png
@ -62,7 +62,7 @@ services:
        text: "Uno strumento alternativo e private oriented della famosa suite di Office."
        button: 'https://cryptpad.disroot.org'
        buttontext: "Accedi"
-        badge: SPERIMENTALE
+        #badge: SPERIMENTALE
    -
        title: 'Games'
        icon: game.png
--- a/vagrant/bootstrap.sh
+++ b/vagrant/bootstrap.sh
@ -15,6 +15,7 @@ sudo debconf-set-selections <<< "postfix postfix/main_mailer_type select No conf
 sudo debconf-set-selections <<< "postfix postfix/mailname string ${WEB_NAME}"

 # Add sury repository to sources.list for PHP7.4
+echo "set grub-pc/install_devices /dev/sda" | debconf-communicate # Fix grub error
 sudo apt-get -y update
 sudo apt-get -y upgrade
 sudo apt-get -y install ca-certificates apt-transport-https