From 223f2e07761de90bb0d1887f68c3965ad6890b2c Mon Sep 17 00:00:00 2001 From: meaz Date: Thu, 4 Feb 2021 06:34:53 +0100 Subject: [PATCH 1/2] Remove badge from services --- pages/01.home/_services/services.de.md | 4 ++-- pages/01.home/_services/services.en.md | 4 ++-- pages/01.home/_services/services.es.md | 4 ++-- pages/01.home/_services/services.fr.md | 12 ++---------- pages/01.home/_services/services.it.md | 4 ++-- pages/01.home/_services/services.ru.md | 4 ++-- pages/11.covid19/_services/services.en.md | 4 ++-- pages/11.covid19/_services/services.es.md | 4 ++-- pages/11.covid19/_services/services.fr.md | 4 ++-- pages/11.covid19/_services/services.it.md | 4 ++-- 10 files changed, 20 insertions(+), 28 deletions(-) diff --git a/pages/01.home/_services/services.de.md b/pages/01.home/_services/services.de.md index b6f8d8db..652ee76c 100644 --- 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 --- diff --git a/pages/01.home/_services/services.en.md b/pages/01.home/_services/services.en.md index cd1ff605..38a2f27b 100644 --- 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 --- diff --git a/pages/01.home/_services/services.es.md b/pages/01.home/_services/services.es.md index c6bde46b..64d691c4 100644 --- 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 --- diff --git a/pages/01.home/_services/services.fr.md b/pages/01.home/_services/services.fr.md index 0441eb75..5b9c2bbf 100644 --- 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: --- diff --git a/pages/01.home/_services/services.it.md b/pages/01.home/_services/services.it.md index 7c7cfa4a..0f1b08e1 100644 --- 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 --- diff --git a/pages/01.home/_services/services.ru.md b/pages/01.home/_services/services.ru.md index 5b10b2f3..54070d00 100644 --- 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 --- diff --git a/pages/11.covid19/_services/services.en.md b/pages/11.covid19/_services/services.en.md index 7f8fea68..5d1c9aa3 100644 --- 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 diff --git a/pages/11.covid19/_services/services.es.md b/pages/11.covid19/_services/services.es.md index b2d64cac..9b49a6c9 100644 --- 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 diff --git a/pages/11.covid19/_services/services.fr.md b/pages/11.covid19/_services/services.fr.md index a3e6e6bd..fd719a3d 100644 --- 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 diff --git a/pages/11.covid19/_services/services.it.md b/pages/11.covid19/_services/services.it.md index af0c9332..4bfea72b 100644 --- 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 From ecc4d0704b3bb7ea2b67610af74e638d0be61a98 Mon Sep 17 00:00:00 2001 From: meaz Date: Tue, 9 Feb 2021 22:43:10 +0100 Subject: [PATCH 2/2] fix error with grub when using vagrant --- vagrant/bootstrap.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/vagrant/bootstrap.sh b/vagrant/bootstrap.sh index d260df94..b6865ecf 100755 --- 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