From 0e1650c0331e36bb1218ab328407332736546cfa Mon Sep 17 00:00:00 2001 From: antil0pa Date: Thu, 5 Sep 2019 12:50:21 +0200 Subject: [PATCH] - removed info about email alias - issue #2163 - fixed buttons on forms - issue #2160 - corrected inconsistency in naming - issue #2039 --- pages/01.home/_services1/services.en.md | 2 +- .../02.email/_email-alias/2col-right.de.md | 2 +- .../02.email/_email-alias/2col-right.en.md | 2 +- .../02.email/_email-alias/2col-right.fr.md | 2 +- pages/forms/alias-request-form/form.de.md | 1 + pages/forms/alias-request-form/form.en.md | 1 + pages/forms/alias-request-form/form.es.md | 3 ++- pages/forms/alias-request-form/form.fr.md | 1 + pages/forms/alias-request-form/form.it.md | 1 + pages/forms/domain-linking-form/form.de.md | 1 + pages/forms/domain-linking-form/form.en.md | 1 + pages/forms/domain-linking-form/form.es.md | 1 + pages/forms/domain-linking-form/form.fr.md | 1 + pages/forms/domain-linking-form/form.it.md | 1 + pages/forms/extra-storage-mailbox/form.en.md | 4 ++-- pages/forms/extra-storage-mailbox/form.es.md | 4 ++-- pages/forms/extra-storage-mailbox/form.fr.md | 4 ++-- pages/forms/extra-storage-mailbox/form.it.md | 5 ++--- vagrant/bootstrap.sh | 15 ++++++++------- 19 files changed, 31 insertions(+), 21 deletions(-) diff --git a/pages/01.home/_services1/services.en.md b/pages/01.home/_services1/services.en.md index c8582aaa..1560c583 100644 --- a/pages/01.home/_services1/services.en.md +++ b/pages/01.home/_services1/services.en.md @@ -27,7 +27,7 @@ services: link: 'https://disroot.org/services/forum' text: 'Discourse – a modern approach to discussion forums / mailing-list. It offers everything your community, group or collective needs to create their communication platform.' - - title: Chat + title: Xmpp chat icon: fa-comments link: 'https://disroot.org/services/xmpp' text: 'Decentralized instant messaging.' diff --git a/pages/03.services/02.email/_email-alias/2col-right.de.md b/pages/03.services/02.email/_email-alias/2col-right.de.md index fb9bf39c..c66a82d2 100644 --- a/pages/03.services/02.email/_email-alias/2col-right.de.md +++ b/pages/03.services/02.email/_email-alias/2col-right.de.md @@ -12,7 +12,7 @@ fontcolor: '#555' ---
-Ein Email-Alias ist im Prinzip nichts anderes als eine Art Nachsendeadresse für Deine Emails. Allen **Disrootern** wird automatisch ein Alias zugeordnet. +Ein Email-Alias ist im Prinzip nichts anderes als eine Art Nachsendeadresse für Deine Emails. Mehr Aliase sind verfügbar für regelmäßige Unterstützer. Mit regelmäßigen Unterstützern meinen wir die Community-Mitglieder, die uns mindestens eine Tasse Kaffee im Monat "kaufen". diff --git a/pages/03.services/02.email/_email-alias/2col-right.en.md b/pages/03.services/02.email/_email-alias/2col-right.en.md index 712954c4..5c09576b 100644 --- a/pages/03.services/02.email/_email-alias/2col-right.en.md +++ b/pages/03.services/02.email/_email-alias/2col-right.en.md @@ -12,7 +12,7 @@ fontcolor: '#555' ---
-An email alias is simply a forwarding email address. All Disrooters are automaticaly given one alias. +An email alias is simply a forwarding email address. More aliases are available for our regular supporters. By regular supporters we think of those who contribute the equivalent of at least one cup of coffee a month. It is not that we are promoting coffee, on the contrary - coffee is actually quite the symbol for [exploitation](http://thesourcefilm.com/) and [inequality](http://www.foodispower.org/coffee/) so we thought that it is a good way to let people measure themselves how much they can give. We found this [list of coffee cup prices](https://www.caffesociety.co.uk/blog/the-cheapest-cities-in-the-world-for-a-cup-of-coffee) around the world, it might not be very accurate, but it gives a good indication of the different fares. Please take time to consider your contribution. If you can 'buy' us one cup of Rio De Janeiro coffee a month that's OK, but If you can afford a Double Decaf Soy Frappuccino With An Extra Shot And Cream a month, then you can really help us keep the **Disroot** platform running and make sure it is available for free for other people with less means. diff --git a/pages/03.services/02.email/_email-alias/2col-right.fr.md b/pages/03.services/02.email/_email-alias/2col-right.fr.md index 3a7fb7ff..d84b5b51 100644 --- a/pages/03.services/02.email/_email-alias/2col-right.fr.md +++ b/pages/03.services/02.email/_email-alias/2col-right.fr.md @@ -12,7 +12,7 @@ fontcolor: '#555' ---
-Des alias sont simplement des adresses emails de transfert, utilisées par exemple pour simplifier une adresse mail compliquée. Tous les Disrooters en reçoivent un automatiquement. +Des alias sont simplement des adresses emails de transfert, utilisées par exemple pour simplifier une adresse mail compliquée. Des alias supplémentaires sont disponibles pour nos contributeurs réguliers. Par contributeurs réguliers, nous pensons à ceux qui contribuent l'équivalent d'au moins une tasse de café par mois. Ce n'est pas que nous faisons la promotion du café, bien au contraire - le café est en fait tout à fait le symbole de [l'exploitation](http://thesourcefilm.com/) et de [l'inégalité](http://www.foodispower.org/coffee/) donc nous avons pensé que c'était une bonne façon de laisser les gens mesurer eux-mêmes combien ils peuvent donner. diff --git a/pages/forms/alias-request-form/form.de.md b/pages/forms/alias-request-form/form.de.md index 1da9ae9b..7fdf3c8d 100644 --- a/pages/forms/alias-request-form/form.de.md +++ b/pages/forms/alias-request-form/form.de.md @@ -117,6 +117,7 @@ form: email: from: alias-request@disroot.org to: '{{ config.plugins.email.to }}' + reply_to: '{{ form.value.username }}@disroot.org' subject: '[Alias request] - {{ form.value.username|e }}' body: '{% include ''forms/data.html.twig'' %}' - diff --git a/pages/forms/alias-request-form/form.en.md b/pages/forms/alias-request-form/form.en.md index 8bd72fb0..c01ec1bb 100644 --- a/pages/forms/alias-request-form/form.en.md +++ b/pages/forms/alias-request-form/form.en.md @@ -116,6 +116,7 @@ form: email: from: alias-request@disroot.org to: '{{ config.plugins.email.to }}' + reply_to: '{{ form.value.username }}@disroot.org' subject: '[Alias request] - {{ form.value.username|e }}' body: '{% include ''forms/data.html.twig'' %}' - diff --git a/pages/forms/alias-request-form/form.es.md b/pages/forms/alias-request-form/form.es.md index 24c65431..a540a2f5 100644 --- a/pages/forms/alias-request-form/form.es.md +++ b/pages/forms/alias-request-form/form.es.md @@ -117,7 +117,8 @@ form: email: from: alias-request@disroot.org to: '{{ config.plugins.email.to }}' - subject: '[Solicitud de Alias] - {{ form.value.username|e }}' + reply_to: '{{ form.value.username }}@disroot.org' + subject: '[Alias request] - {{ form.value.username|e }}' body: '{% include ''forms/data.html.twig'' %}' - save: diff --git a/pages/forms/alias-request-form/form.fr.md b/pages/forms/alias-request-form/form.fr.md index 2e0e24a2..79b6e406 100644 --- a/pages/forms/alias-request-form/form.fr.md +++ b/pages/forms/alias-request-form/form.fr.md @@ -117,6 +117,7 @@ form: email: from: alias-request@disroot.org to: '{{ config.plugins.email.to }}' + reply_to: '{{ form.value.username }}@disroot.org' subject: '[Alias request] - {{ form.value.username|e }}' body: '{% include ''forms/data.html.twig'' %}' - diff --git a/pages/forms/alias-request-form/form.it.md b/pages/forms/alias-request-form/form.it.md index b47ef4b6..c295a391 100644 --- a/pages/forms/alias-request-form/form.it.md +++ b/pages/forms/alias-request-form/form.it.md @@ -116,6 +116,7 @@ form: email: from: alias-request@disroot.org to: '{{ config.plugins.email.to }}' + reply_to: '{{ form.value.username }}@disroot.org' subject: '[Alias request] - {{ form.value.username|e }}' body: '{% include ''forms/data.html.twig'' %}' - diff --git a/pages/forms/domain-linking-form/form.de.md b/pages/forms/domain-linking-form/form.de.md index 28dbc919..15df330e 100644 --- a/pages/forms/domain-linking-form/form.de.md +++ b/pages/forms/domain-linking-form/form.de.md @@ -125,6 +125,7 @@ form: email: from: alias-request@disroot.org to: '{{ config.plugins.email.to }}' + reply_to: '{{ form.value.username }}@disroot.org' subject: '[Domain linking request] - {{ form.value.username|e }}' body: '{% include ''forms/data.html.twig'' %}' - diff --git a/pages/forms/domain-linking-form/form.en.md b/pages/forms/domain-linking-form/form.en.md index 797c699c..6e292f75 100644 --- a/pages/forms/domain-linking-form/form.en.md +++ b/pages/forms/domain-linking-form/form.en.md @@ -124,6 +124,7 @@ form: email: from: alias-request@disroot.org to: '{{ config.plugins.email.to }}' + reply_to: '{{ form.value.username }}@disroot.org' subject: '[Domain linking request] - {{ form.value.username|e }}' body: '{% include ''forms/data.html.twig'' %}' - diff --git a/pages/forms/domain-linking-form/form.es.md b/pages/forms/domain-linking-form/form.es.md index 9dca95f5..a2531ae0 100644 --- a/pages/forms/domain-linking-form/form.es.md +++ b/pages/forms/domain-linking-form/form.es.md @@ -124,6 +124,7 @@ form: email: from: alias-request@disroot.org to: '{{ config.plugins.email.to }}' + reply_to: '{{ form.value.username }}@disroot.org' subject: '[Domain linking request] - {{ form.value.username|e }}' body: '{% include ''forms/data.html.twig'' %}' - diff --git a/pages/forms/domain-linking-form/form.fr.md b/pages/forms/domain-linking-form/form.fr.md index eec5fd45..d36ed925 100644 --- a/pages/forms/domain-linking-form/form.fr.md +++ b/pages/forms/domain-linking-form/form.fr.md @@ -124,6 +124,7 @@ form: email: from: alias-request@disroot.org to: '{{ config.plugins.email.to }}' + reply_to: '{{ form.value.username }}@disroot.org' subject: '[Domain linking request] - {{ form.value.username|e }}' body: '{% include ''forms/data.html.twig'' %}' - diff --git a/pages/forms/domain-linking-form/form.it.md b/pages/forms/domain-linking-form/form.it.md index f84496c1..10fbe10c 100644 --- a/pages/forms/domain-linking-form/form.it.md +++ b/pages/forms/domain-linking-form/form.it.md @@ -124,6 +124,7 @@ form: email: from: alias-request@disroot.org to: '{{ config.plugins.email.to }}' + reply_to: '{{ form.value.username }}@disroot.org' subject: '[Domain linking request] - {{ form.value.username|e }}' body: '{% include ''forms/data.html.twig'' %}' - diff --git a/pages/forms/extra-storage-mailbox/form.en.md b/pages/forms/extra-storage-mailbox/form.en.md index dc2982b1..ca182c18 100644 --- a/pages/forms/extra-storage-mailbox/form.en.md +++ b/pages/forms/extra-storage-mailbox/form.en.md @@ -66,7 +66,7 @@ form: required: true - name: frequency - label: Monthly/Yearly + label: Yearly type: radio default: yearly options: @@ -109,5 +109,5 @@ form: display: thankyou --- -

Extra Storage Space

+

Extra Mailbox Storage

It is possible to extend your E-mail storage with up to 10 GB for the cost of 0.15 euro per GB per month, paid yearly. If you are adding storage both to your mailbox and cloud account - use [this form](https://disroot.org/en/forms/extra-storage-space)

diff --git a/pages/forms/extra-storage-mailbox/form.es.md b/pages/forms/extra-storage-mailbox/form.es.md index d37dd80d..1ab84102 100644 --- a/pages/forms/extra-storage-mailbox/form.es.md +++ b/pages/forms/extra-storage-mailbox/form.es.md @@ -63,7 +63,7 @@ form: required: true - name: Frecuencia - label: Mensual/Anual + label: Anual type: radio default: yearly options: @@ -107,4 +107,4 @@ form: ---

Espacio de almacenamiento adicional

-

Es posible aumentar el espacio de almacenamiento de tu E-mail hasta 10 GB por 0.15 euro por GB mensual. Si estás adicionando espacio para tus cuentas de correo y la nube, utiliza [este formulario](https://disroot.org/es/forms/extra-storage-space)

+

Es posible aumentar el espacio de almacenamiento de tu E-mail hasta 10 GB por 0.15 euro por GB mensual. Si estás adicionando espacio para tus cuentas de correo y la nube, utiliza [este formulario](https://disroot.org/es/forms/extra-storage-space)

diff --git a/pages/forms/extra-storage-mailbox/form.fr.md b/pages/forms/extra-storage-mailbox/form.fr.md index e82d756e..59c70c10 100644 --- a/pages/forms/extra-storage-mailbox/form.fr.md +++ b/pages/forms/extra-storage-mailbox/form.fr.md @@ -63,7 +63,7 @@ form: required: true - name: frequency - label: Mensuellement/Annuellement + label: Annuellement type: radio default: Annuellement options: @@ -107,4 +107,4 @@ form: ---

Espace de stockage supplémentaire

-

Il est possible d'étendre la capacité de stockage de votre messagerie jusqu'à 10 Go pour le coût de 0,15 euro par Go et par mois, payé annuellement. Pour demander de l'espace de stockage supplémentaire pour votre messagerie et votre compte cloud, vous devez remplir ce [formulaire](https://disroot.org/en/forms/extra-storage-space)

+

Il est possible d'étendre la capacité de stockage de votre messagerie jusqu'à 10 Go pour le coût de 0,15 euro par Go et par mois, payé annuellement. Pour demander de l'espace de stockage supplémentaire pour votre messagerie et votre compte cloud, vous devez remplir ce [formulaire](https://disroot.org/en/forms/extra-storage-space)

diff --git a/pages/forms/extra-storage-mailbox/form.it.md b/pages/forms/extra-storage-mailbox/form.it.md index 271a86a8..6713eb35 100644 --- a/pages/forms/extra-storage-mailbox/form.it.md +++ b/pages/forms/extra-storage-mailbox/form.it.md @@ -64,11 +64,10 @@ form: required: true - name: frequency - label: Mensile/Annuale + label: Annuale type: radio default: yearly options: - monthly: Mensile yearly: Annuale validate: required: true @@ -109,4 +108,4 @@ form: ---

Spazio di archiviazione extra

-

E' possibile estendere l'archiviazione della posta elettronica fino a 10 GB al costo di 0,15 euro per GB al mese. Se state aggiungendo spazio di archiviazione sia alla vostra casella di posta che al vostro account cloud - utilizzate [questo modulo](https://disroot.org/en/forms/extra-storage-space)

+

E' possibile estendere l'archiviazione della posta elettronica fino a 10 GB al costo di 0,15 euro per GB al mese. Se state aggiungendo spazio di archiviazione sia alla vostra casella di posta che al vostro account cloud - utilizzate [questo modulo](https://disroot.org/en/forms/extra-storage-space)

diff --git a/vagrant/bootstrap.sh b/vagrant/bootstrap.sh index d323d276..7b19a783 100755 --- a/vagrant/bootstrap.sh +++ b/vagrant/bootstrap.sh @@ -7,17 +7,17 @@ WWWUSER="www-data" # Provisioning actions -# Add dotdeb repository to sources.list for PHP7.0 -# echo "deb http://packages.dotdeb.org jessie all" | sudo tee -a /etc/apt/sources.list.d/dotdeb.list -# echo "deb-src http://packages.dotdeb.org jessie all" | sudo tee -a /etc/apt/sources.list.d/dotdeb.list -# Dotdeb Key for PHP7.0 -# wget -qO - http://www.dotdeb.org/dotdeb.gpg | sudo apt-key add - +# Add sury repository to sources.list for PHP7.1 +sudo apt install ca-certificates apt-transport-https +echo "deb https://packages.sury.org/php/ stretch main" | sudo tee -a /etc/apt/sources.list.d/php.list +# Sury Key for PHP7.1 +wget -q https://packages.sury.org/php/apt.gpg -O- | sudo apt-key add - sudo apt-get -y update echo "Installing Apache.." sudo apt-get install -y apache2 composer echo "Installing php7.." -sudo apt-get install -y php7.0-zip php7.0-cli php7.0-curl php7.0-gd php7.0-mysql php7.0-mbstring php7.0-xml libapache2-mod-php7.0 php7.0-mcrypt php7.0-fpm +sudo apt-get install -y php7.1-zip php7.1-cli php7.1-curl php7.1-gd php7.1-mysql php7.1-mbstring php7.1-xml libapache2-mod-php7.1 php7.1-mcrypt php7.1-fpm # Enable all the Apache mods sudo a2enmod proxy proxy_fcgi rewrite @@ -28,7 +28,7 @@ sudo rsync -cr /vagrant/provision/etc/apache2/sites-available/ /etc/apache2/site sudo sed -i "s/ServerName V_DOMAIN_NAME/ServerName $H2DIR/g" /etc/apache2/sites-available/*.conf sudo sed -i "s/V_DOMAIN_NAME/$H2DIR/g" /etc/apache2/sites-available/*.conf sudo a2ensite "$H2DIR".conf -sudo a2enconf php7.0-fpm +sudo a2enconf php-fpm sudo rm /etc/apache2/sites-enabled/000-default.conf sudo service apache2 restart @@ -40,6 +40,7 @@ sudo chmod 775 -R bin/ sudo -u www-data bin/grav install #sudo -u www-data bin/gpm install disroot sudo -u www-data bin/gpm install language-selector +sudo -u www-data bin/gpm install form sudo -u www-data sed -i 's/quark/disroot/g' $WEBROOT/user/config/system.yaml sudo -u www-data ex -s -c '13i|redirect_default_route: true' -c x $WEBROOT/user/config/system.yaml sudo -u www-data echo "