Merge branch 'master' into NC_clients2

2019-12-30 13:56:02 +01:00 · 2019-12-30 13:56:02 +01:00 · 643ce8b01e
parent e3492e9070 1631b04710
commit 643ce8b01e
35 changed files with 417 additions and 26 deletions
--- a/pages/aliaschallenge/_domains/domains.it.md
+++ b/pages/aliaschallenge/_domains/domains.it.md
@ -0,0 +1,35 @@
+---
+title: Domains
+section_id: services
+bgcolor: '#f2f2f2ff'
+fontcolor: '#555'
+text_align: left
+services:
+    -
+        title: "#GlorifiedHacker"
+        text: "glorifiedhacker.net"
+        button1: 'https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&lc=en&hosted_button_id=J36HJARW8FGGS'
+        button2: 'aliaschallenge/glorifiedhacker'
+    -
+        title: "#GetGoogleOffMe"
+        text: "getgoogleoff.me"
+        button1: 'https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&lc=en&hosted_button_id=ZE2GP4QZNZ7L6'
+        button2: 'aliaschallenge/getgoogleoffme'
+    -
+        title: "#Morecats"
+        text: "morecats.net"
+        button1: 'https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&lc=en&hosted_button_id=B5RR8H4Q7MKN6'
+        button2: 'aliaschallenge/morecats'
+
+---
+
+<div style="width: 50%; margin-left: auto; margin-right: auto;">
+
+<h4 style="color:#327E82;">Bank transfer:</h4>
+<p style="color:#327E82; font-size:1.8em; line-height:1.4"> Stichting Disroot.org <br>
+IBAN NL19 TRIO 0338 7622 05 <br>
+BIC TRIONL2U
+</p>
+<h4 style="color:#327E82;">Non dimenticare di menzionare la tua scelta nel riferimento!</h4>
+</div>
+<br>
--- a/pages/aliaschallenge/_goal/fullbar.de.md
+++ b/pages/aliaschallenge/_goal/fullbar.de.md
@ -14,7 +14,7 @@ text_align: left
 <img src="/user/pages/aliaschallenge/_goal/trophy.png" alt="Trophy" width="80" />

 <span class="timer">
-Noch 6 Tage
+Noch 2 Tage
 </span>

 </div>
--- a/pages/aliaschallenge/_goal/fullbar.en.md
+++ b/pages/aliaschallenge/_goal/fullbar.en.md
@ -14,7 +14,7 @@ text_align: left
 <img src="/user/pages/aliaschallenge/_goal/trophy.png" alt="Trophy" width="80" />

 <span class="timer">
-6 days left
+2 days left
 </span>

 </div>
--- a/pages/aliaschallenge/_goal/fullbar.es.md
+++ b/pages/aliaschallenge/_goal/fullbar.es.md
@ -14,7 +14,7 @@ text_align: left
 <img src="/user/pages/aliaschallenge/_goal/trophy.png" alt="Trophy" width="80" />

 <span class="timer">
-6 days left
+2 days left
 </span>

 </div>
--- a/pages/aliaschallenge/_goal/fullbar.it.md
+++ b/pages/aliaschallenge/_goal/fullbar.it.md
@ -0,0 +1,24 @@
+---
+title: 'Goal'
+bgcolor: '#09846aff'
+fontcolor: '#FFFFFF'
+text_align: left
+---
+
+<br>
+
+
+<h3 id="goaltitle"> Aiutaci a raggiungere il traguardo di 1500€ </h3>
+
+<div class="cup">
+<img src="/user/pages/aliaschallenge/_goal/trophy.png" alt="Trophy" width="80" />
+
+<span class="timer">
+2 days left
+</span>
+
+</div>
+
+<div class="tree">
+<img src="/user/pages/aliaschallenge/_goal/tree.png" alt="Tree of cats" />
+</div>
--- a/pages/aliaschallenge/_goal/fullbar.pt.md
+++ b/pages/aliaschallenge/_goal/fullbar.pt.md
@ -14,7 +14,7 @@ text_align: left
 <img src="/user/pages/aliaschallenge/_goal/trophy.png" alt="Trophy" width="80" />

 <span class="timer">
-Faltam 6 dias
+Faltam 2 dias
 </span>

 </div>
--- a/pages/aliaschallenge/_intro/fullbar.it.md
+++ b/pages/aliaschallenge/_intro/fullbar.it.md
@ -0,0 +1,18 @@
+---
+title: 'Introduzione'
+bgcolor: '#7b384fff'
+fontcolor: '#FFF'
+text_align: left
+---
+
+<br>
+
+<span style="padding-right:10%;" id="fund1">
+Negli ultimi giorni di quest'anno, mentre il mondo intero si prepara a salutare la luce del nuovo decennio, tre domini si stanno battendo tra di loro. Chi la spunterà? **Unisciti alla battaglia e scegli il tuo dominio preferito**.
+</span>
+
+<span style="padding-right:30%;" id="fund2">
+Dal 23 dicembre al 1 gennaio, partecipa al nostro evento di raccolta fondi di fine anno. **Dona a Disroot** utilizzando uno degli hashtag di dominio che trovi sotto come riferimento per la donazione. Il nome di dominio vittorioso verrà dato come **alias extra per tutti i Disrooter**.
+</span>
+
+## Il dominio più cool vince!
--- a/pages/aliaschallenge/_pagebottom/3col.it.md
+++ b/pages/aliaschallenge/_pagebottom/3col.it.md
@ -0,0 +1,14 @@
+---
+title: 'Ranking'
+bgcolor: '#7b384fff'
+fontcolor: '#FFF'
+text_align: center
+---
+
+---
+
+---
+
+<div id="iconlicence">
+- Le icone di questa pagina sono state create da Smashicons, Freepik e Monkik su flaticon.com -
+</div>
--- a/pages/aliaschallenge/_ranking/fullbar.de.md
+++ b/pages/aliaschallenge/_ranking/fullbar.de.md
@ -9,7 +9,7 @@ text_align: center


 <div class="dots">
-    <hr class="left"  style="width: 7vw;" /><h2 class="right"> 144 € </h2>
+    <hr class="left"  style="width: 9vw;" /><h2 class="right"> 175 € </h2>
    <figure>
    <img src="/user/pages/aliaschallenge/_ranking/hacker.png" width="60">
    <figcaption>glorifiedhacker.net</figcaption>
@ -17,7 +17,7 @@ text_align: center
 </div>

 <div class="dots" >
-    <hr class="left" style="width: 18vw;" /><h2 class="right"> 372 € </h2>
+    <hr class="left" style="width: 32vw;" /><h2 class="right"> 650 € </h2>
    <figure>
    <img src="/user/pages/aliaschallenge/_ranking/google.png" width="60">
    <figcaption>getgoogleoff.me</figcaption>
@ -27,7 +27,7 @@ text_align: center
 </div>

 <div class="dots" >
-    <hr class="left" style="width:11vw;" /><h2 class="right"> 223 € </h2>
+    <hr class="left" style="width:23vw;" /><h2 class="right"> 466 € </h2>
    <figure>
    <img src="/user/pages/aliaschallenge/_ranking/cat.png" width="60">
    <figcaption>morecats.net</figcaption>
--- a/pages/aliaschallenge/_ranking/fullbar.en.md
+++ b/pages/aliaschallenge/_ranking/fullbar.en.md
@ -9,7 +9,7 @@ text_align: center


 <div class="dots">
-    <hr class="left"  style="width: 7vw;" /><h2 class="right"> 144€ </h2>
+    <hr class="left"  style="width: 9vw;" /><h2 class="right"> 175€ </h2>
    <figure>
    <img src="/user/pages/aliaschallenge/_ranking/hacker.png" width="60">
    <figcaption>glorifiedhacker.net</figcaption>
@ -17,7 +17,7 @@ text_align: center
 </div>

 <div class="dots" >
-    <hr class="left" style="width: 18vw;" /><h2 class="right"> 372€ </h2>
+    <hr class="left" style="width: 32vw;" /><h2 class="right"> 650€ </h2>
    <figure>
    <img src="/user/pages/aliaschallenge/_ranking/google.png" width="60">
    <figcaption>getgoogleoff.me</figcaption>
@ -27,7 +27,7 @@ text_align: center
 </div>

 <div class="dots" >
-    <hr class="left" style="width:11vw;" /><h2 class="right"> 223€ </h2>
+    <hr class="left" style="width: 23vw;" /><h2 class="right"> 466€ </h2>
    <figure>
    <img src="/user/pages/aliaschallenge/_ranking/cat.png" width="60">
    <figcaption>morecats.net</figcaption>
--- a/pages/aliaschallenge/_ranking/fullbar.es.md
+++ b/pages/aliaschallenge/_ranking/fullbar.es.md
@ -9,7 +9,7 @@ text_align: center


 <div class="dots">
-    <hr class="left"  style="width: 7vw;" /><h2 class="right"> 144€ </h2>
+    <hr class="left"  style="width: 9vw;" /><h2 class="right"> 175€ </h2>
    <figure>
    <img src="/user/pages/aliaschallenge/_ranking/hacker.png" width="60">
    <figcaption>glorifiedhacker.net</figcaption>
@ -17,7 +17,7 @@ text_align: center
 </div>

 <div class="dots" >
-    <hr class="left" style="width: 18vw;" /><h2 class="right"> 372€ </h2>
+    <hr class="left" style="width: 32vw;" /><h2 class="right"> 650€ </h2>
    <figure>
    <img src="/user/pages/aliaschallenge/_ranking/google.png" width="60">
    <figcaption>getgoogleoff.me</figcaption>
@ -27,7 +27,7 @@ text_align: center
 </div>

 <div class="dots" >
-    <hr class="left" style="width:11vw;" /><h2 class="right"> 223€ </h2>
+    <hr class="left" style="width:23vw;" /><h2 class="right"> 466€ </h2>
    <figure>
    <img src="/user/pages/aliaschallenge/_ranking/cat.png" width="60">
    <figcaption>morecats.net</figcaption>
--- a/pages/aliaschallenge/_ranking/fullbar.it.md
+++ b/pages/aliaschallenge/_ranking/fullbar.it.md
@ -0,0 +1,35 @@
+---
+title: 'Ranking'
+bgcolor: '#7b384fff'
+fontcolor: '#FFF'
+text_align: center
+---
+
+<h1 style="color: #ffffff; font-size: 56px; font-family: 'kingthings_christmas'; line-height: 1.2;">Ranking</h1>
+
+
+<div class="dots">
+    <hr class="left"  style="width: 9vw;" /><h2 class="right"> 175€ </h2>
+    <figure>
+    <img src="/user/pages/aliaschallenge/_ranking/hacker.png" width="60">
+    <figcaption>glorifiedhacker.net</figcaption>
+    </figure>
+</div>
+
+<div class="dots" >
+    <hr class="left" style="width: 32vw;" /><h2 class="right"> 650€ </h2>
+    <figure>
+    <img src="/user/pages/aliaschallenge/_ranking/google.png" width="60">
+    <figcaption>getgoogleoff.me</figcaption>
+    </figure>
+
+
+</div>
+
+<div class="dots" >
+    <hr class="left" style="width:23vw;" /><h2 class="right"> 466€ </h2>
+    <figure>
+    <img src="/user/pages/aliaschallenge/_ranking/cat.png" width="60">
+    <figcaption>morecats.net</figcaption>
+    </figure>
+</div>
--- a/pages/aliaschallenge/_ranking/fullbar.pt.md
+++ b/pages/aliaschallenge/_ranking/fullbar.pt.md
@ -9,7 +9,7 @@ text_align: center


 <div class="dots">
-    <hr class="left"  style="width: 7vw;" /><h2 class="right"> 144€ </h2>
+    <hr class="left"  style="width: 9vw;" /><h2 class="right"> 175€ </h2>
    <figure>
    <img src="/user/pages/aliaschallenge/_ranking/hacker.png" width="60">
    <figcaption>glorifiedhacker.net</figcaption>
@ -17,7 +17,7 @@ text_align: center
 </div>

 <div class="dots" >
-    <hr class="left" style="width: 18vw;" /><h2 class="right"> 372€ </h2>
+    <hr class="left" style="width: 32vw;" /><h2 class="right"> 650€ </h2>
    <figure>
    <img src="/user/pages/aliaschallenge/_ranking/google.png" width="60">
    <figcaption>getgoogleoff.me</figcaption>
@ -27,7 +27,7 @@ text_align: center
 </div>

 <div class="dots" >
-    <hr class="left" style="width:11vw;" /><h2 class="right"> 223€ </h2>
+    <hr class="left" style="width:23vw;" /><h2 class="right"> 466€ </h2>
    <figure>
    <img src="/user/pages/aliaschallenge/_ranking/cat.png" width="60">
    <figcaption>morecats.net</figcaption>
--- a/pages/aliaschallenge/_rewards/challenges.it.md
+++ b/pages/aliaschallenge/_rewards/challenges.it.md
@ -0,0 +1,25 @@
+---
+title: 'Ricompensa'
+bgcolor: '#f2f2f2ff'
+fontcolor: '#327E82'
+text_align: left
+clients:
+    -
+        title: "Dona 30€"
+        text: "Ottieni un biglietto di auguri personale per il nuovo anno."
+    -
+        title: "Dona 75€"
+        text: "Una sorpresa speciale per il nuovo anno nella tua casella di posta."
+    -
+        title: "Dona 100€"
+        text: "Scegli una nuova immagine per la prima pagina di Disroot.org per due settimane."
+    -
+        title: "Dona 500€"
+        text: "Seleziona un nuovo nome di dominio per un alias Disroot personalizzato da assegnare a tutti i Disrooter."
+
+
+---
+
+<div markdown=1>
+`*` Disroot.org si riserva il diritto di negare il premio se l'immagine o il nome violano i nostri <a href="/tos"> Termini di servizi.</a>
+</div>
--- a/pages/aliaschallenge/_rewardstitle/fullbar.it.md
+++ b/pages/aliaschallenge/_rewardstitle/fullbar.it.md
@ -0,0 +1,11 @@
+---
+title: 'Rewards title'
+bgcolor: '#09846aff'
+fontcolor: '#FFF'
+text_align: center
+---
+
+<br>
+<p id="rewardtitle">
+Premi speciali:
+</p>
--- a/pages/aliaschallenge/_title/fullbar.it.md
+++ b/pages/aliaschallenge/_title/fullbar.it.md
@ -0,0 +1,12 @@
+---
+title: 'Challenge title'
+bgcolor: '#f2f2f2ff'
+fontcolor: '#FFF'
+text_align: center
+---
+
+<br>
+<p id="challengetitle">
+La fenomenale sfida<br>
+<span id="challengesubtitle"> "Bonus Alias Challenge" </span>
+</p>
--- a/pages/aliaschallenge/getgoogleoffme/_bitcoin/2col-right.it.md
+++ b/pages/aliaschallenge/getgoogleoffme/_bitcoin/2col-right.it.md
@ -0,0 +1,13 @@
+---
+title: Bitcoin
+bgcolor: '#1F5C60'
+fontcolor: '#FFF'
+---
+
+![](googleoff-bitcoin.png)
+
+---
+
+# Bitcoin
+Invia i Bitcoin al nostro portamonete:
+bc1q2sxxsuz7r8qwgaj4u29grukapwjq9e7cetwl9u
--- a/pages/aliaschallenge/getgoogleoffme/_crypto/2col-left.it.md
+++ b/pages/aliaschallenge/getgoogleoffme/_crypto/2col-left.it.md
@ -0,0 +1,8 @@
+---
+title: crypto
+bgcolor: '#1F5C60'
+fontcolor: '#FFF'
+text_align: left
+---
+
+## Dona e vota per getgoogleoff.me:
--- a/pages/aliaschallenge/getgoogleoffme/_faircoin/2col-right.it.md
+++ b/pages/aliaschallenge/getgoogleoffme/_faircoin/2col-right.it.md
@ -0,0 +1,13 @@
+---
+title: Faircoin
+bgcolor: '#1F5C60'
+fontcolor: '#FFF'
+---
+
+![](googleoff-faircoin.png)
+
+---
+
+# Faircoin
+Invia faircoins's al nostro portamonete:
+fGZAUsGE2DEMBL6KZ9UV3yEn2A6fKTRkj6
--- a/pages/aliaschallenge/getgoogleoffme/_monero/2col-right.it.md
+++ b/pages/aliaschallenge/getgoogleoffme/_monero/2col-right.it.md
@ -0,0 +1,13 @@
+---
+title: Monero
+bgcolor: '#1F5C60'
+fontcolor: '#FFF'
+---
+
+![](googleoff-monero.png)
+
+---
+
+# Monero
+Invia i tuoi monero al nostro portamonete:
+87Js9xHUSReL3RTxJve8ZxZQzsJmzk4fD2rrdvC5tJBqSXMkBtLsiDZLDzrf6GbQpj4N35RH39HsA8iwgWmoonyqLzSwtaz
--- a/pages/aliaschallenge/getgoogleoffme/modular.it.md
+++ b/pages/aliaschallenge/getgoogleoffme/modular.it.md
@ -0,0 +1,16 @@
+---
+title: Cryptocurrencies
+content:
+    items: '@self.modular'
+    order:
+        by: default
+        dir: asc
+        custom:
+            - _crypto
+            - _bitcoin
+            - _monero
+            - _faircoin
+            - _pagebottom
+body_classes: modular
+header_image: burning_money.png
+---
--- a/pages/aliaschallenge/glorifiedhacker/_bitcoin/2col-right.it.md
+++ b/pages/aliaschallenge/glorifiedhacker/_bitcoin/2col-right.it.md
@ -0,0 +1,13 @@
+---
+title: Bitcoin
+bgcolor: '#1F5C60'
+fontcolor: '#FFF'
+---
+
+![](hacker-bitcoin.png)
+
+---
+
+# Bitcoin
+Invia i tuoi bitcoin al nostro portamonete:
+bc1qld0wgrpd29uv3u3uhvrnqec9s8j57qspasngc9
--- a/pages/aliaschallenge/glorifiedhacker/_crypto/2col-left.it.md
+++ b/pages/aliaschallenge/glorifiedhacker/_crypto/2col-left.it.md
@ -0,0 +1,8 @@
+---
+title: crypto
+bgcolor: '#1F5C60'
+fontcolor: '#FFF'
+text_align: left
+---
+
+## Dona e vota per glorifiedhacker.net:
--- a/pages/aliaschallenge/glorifiedhacker/_faircoin/2col-right.it.md
+++ b/pages/aliaschallenge/glorifiedhacker/_faircoin/2col-right.it.md
@ -0,0 +1,13 @@
+---
+title: Faircoin
+bgcolor: '#1F5C60'
+fontcolor: '#FFF'
+---
+
+![](hacker-faircoin.png)
+
+---
+
+# Faircoin
+Invia i tuoi faircoin al nostro portamonete:
+fdFr8kpBwNmEtYkT6Qb4XMULNZi7VgRovh
--- a/pages/aliaschallenge/glorifiedhacker/_monero/2col-right.it.md
+++ b/pages/aliaschallenge/glorifiedhacker/_monero/2col-right.it.md
@ -0,0 +1,13 @@
+---
+title: Monero
+bgcolor: '#1F5C60'
+fontcolor: '#FFF'
+---
+
+![](hacker-monero.png)
+
+---
+
+# Monero
+Invia i tuoi moneno al nostro portamonete:
+88rqxvsMEorAuPXTSCgnRRH8CFHubxcxPKircpudbx1VfbTj73MxuZka7FrkKB1WuEG4UM8vCqY76Mo47DPb7jTSV1ni46p
--- a/pages/aliaschallenge/glorifiedhacker/modular.it.md
+++ b/pages/aliaschallenge/glorifiedhacker/modular.it.md
@ -0,0 +1,16 @@
+---
+title: Cryptocurrencies
+content:
+    items: '@self.modular'
+    order:
+        by: default
+        dir: asc
+        custom:
+            - _crypto
+            - _bitcoin
+            - _monero
+            - _faircoin
+            - _pagebottom
+body_classes: modular
+header_image: burning_money.png
+---
--- a/pages/aliaschallenge/modular.it.md
+++ b/pages/aliaschallenge/modular.it.md
@ -0,0 +1,19 @@
+---
+title: Alias-challenge
+content:
+    items: '@self.modular'
+    order:
+        by: default
+        dir: asc
+        custom:
+            - _title
+            - _intro
+            - _goal
+            - _domains
+            - _rewardstitle
+            - _rewards
+            - _ranking
+            - _pagebottom
+body_classes: modular
+header_image: 'header2.jpg'
+---
--- a/pages/aliaschallenge/morecats/_bitcoin/2col-right.it.md
+++ b/pages/aliaschallenge/morecats/_bitcoin/2col-right.it.md
@ -0,0 +1,14 @@
+---
+title: Bitcoin
+media_order: '1GN.png,qr0719.png'
+bgcolor: '#1F5C60'
+fontcolor: '#FFF'
+---
+
+![](morecats-bitcoin.png)
+
+---
+
+# Bitcoin
+Invia i tuoi bitcoin al nostro portamonete:
+bc1q2r5ufc68unc8g8na57sufjgcjpvgvlztnswgw3
--- a/pages/aliaschallenge/morecats/_crypto/2col-left.it.md
+++ b/pages/aliaschallenge/morecats/_crypto/2col-left.it.md
@ -0,0 +1,8 @@
+---
+title: crypto
+bgcolor: '#1F5C60'
+fontcolor: '#FFF'
+text_align: left
+---
+
+## Dona e vota per morecats.net:
--- a/pages/aliaschallenge/morecats/_faircoin/2col-right.it.md
+++ b/pages/aliaschallenge/morecats/_faircoin/2col-right.it.md
@ -0,0 +1,13 @@
+---
+title: Faircoin
+bgcolor: '#1F5C60'
+fontcolor: '#FFF'
+---
+
+![](cats-faircoin.png)
+
+---
+
+# Faircoin
+Invita i tuoi faircoin al nostro portamonete:
+fZFFQcXBdUyvTRAwzxtMJ5VhFurWvEZGGx
--- a/pages/aliaschallenge/morecats/_monero/2col-right.it.md
+++ b/pages/aliaschallenge/morecats/_monero/2col-right.it.md
@ -0,0 +1,13 @@
+---
+title: Monero
+bgcolor: '#1F5C60'
+fontcolor: '#FFF'
+---
+
+![](morecats-monero.png)
+
+---
+
+# Monero
+Invia i tuoi monero al nostro portamonete:
+8BXP6mKZioYjRJtwzpB1vQ6iMCXbyasMMa8VUbu6LbBa25KvAUn7fSteNyv5KsE1dhjPxBSoDo7rzVGMmfXYwntXBDQhNQr
--- a/pages/aliaschallenge/morecats/modular.it.md
+++ b/pages/aliaschallenge/morecats/modular.it.md
@ -0,0 +1,16 @@
+---
+title: Cryptocurrencies
+content:
+    items: '@self.modular'
+    order:
+        by: default
+        dir: asc
+        custom:
+            - _crypto
+            - _bitcoin
+            - _monero
+            - _faircoin
+            - _pagebottom
+body_classes: modular
+header_image: burning_money.png
+---
--- a/vagrant/README.md
+++ b/vagrant/README.md
@ -1,4 +1,4 @@
-## This Vagrant setup is still Work in Progress and not ready to use as is.
+## This Vagrant setup is still Work in Progress, though it can be used as is.

 # Disroot Website Development Environment using Vagrant

--- a/vagrant/bootstrap.sh
+++ b/vagrant/bootstrap.sh
@ -7,21 +7,26 @@ WWW_USER="www-data"

 # Provisioning actions

-# Add sury repository to sources.list for PHP7.1
+# Add sury repository to sources.list for PHP7.4
 sudo apt-get -y update
 sudo apt-get -y upgrade
 sudo apt-get -y 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
+
+# Sury Key for PHP7.4
 wget -q https://packages.sury.org/php/apt.gpg -O- | sudo apt-key add -
 sudo apt-get -y update

-echo "Installing nginx.."
-sudo apt-get install -y nginx-full composer
-echo "Installing php7.."
-sudo apt-get install -y php7.3-zip php7.3-cli php7.3-curl php7.3-gd php7.3-mbstring php7.3-xml php7.3-fpm
+echo "Installing nginx..."
+sudo apt-get install -y nginx-full

-# Create the Apache config files and restart webserver
+echo "Installing composer..."
+sudo apt-get install -y composer
+
+echo "Installing php7..."
+sudo apt-get install -y php7.4-zip php7.4-cli php7.4-curl php7.4-gd php7.4-mbstring php7.4-xml php7.4-fpm
+
+# Create the Nginx config files and restart webserver
 sudo rsync -cr /vagrant/provision/etc/nginx/sites-available /etc/nginx/
 sudo ln -s /etc/nginx/sites-available/"${WEB_NAME}".conf /etc/nginx/sites-enabled/"${WEB_NAME}".conf
 sudo rm /etc/nginx/sites-enabled/default
@ -29,7 +34,7 @@ sudo service nginx restart

 # Install GRAV in webroot
 sudo chown -R ${WWW_USER}:${WWW_USER} /var/www
-sudo wget https://getcomposer.org/download/1.8.0/composer.phar -O /usr/local/bin/composer && sudo chmod 755 /usr/local/bin/composer
+sudo wget https://getcomposer.org/download/1.9.1/composer.phar -O /usr/local/bin/composer && sudo chmod 755 /usr/local/bin/composer
 echo "Git"
 git clone -b master https://github.com/getgrav/grav.git "${WEB_ROOT}""${WEB_NAME}"
 sudo chown -R ${WWW_USER}:${WWW_USER} "${WEB_ROOT}"
@ -59,6 +64,9 @@ sudo -u "${WWW_USER}" sed -i '4d' "${WEB_ROOT}""${WEB_NAME}"/user/config/system.
 sudo -u "${WWW_USER}" ex -s -c "4i|  alias: '/home'" -c x "${WEB_ROOT}""${WEB_NAME}"/user/config/system.yaml
 sudo -u "${WWW_USER}" -i 's/false/true/g' "${WEB_ROOT}""${WEB_NAME}"/user/plugins/language-selector/language-selector.yaml

+# Add Grav config (the second extra false should be set to true, but it creates an error in Grav ("Trying to access array offset on value of type null")
+sed -i "s/extra:\ false/\extra:\ false\n\    auto_line_breaks:\ true\n\    auto_url_links:\ true\n\    escape_markup:\ false\n\    special_chars:\n\      \'\>\':\ \'gt\'\n\      \'\<\':\ \'lt\'/" "${WEB_ROOT}""${WEB_NAME}"/user/config/system.yaml
+
 # Add website domain to local /etc/hosts file
 sudo sed -i "s/127.0.0.1\tlocalhost/127.0.0.1\tlocalhost $WEB_NAME/" /etc/hosts

--- a/vagrant/provision/etc/nginx/sites-available/disroot.lan.conf
+++ b/vagrant/provision/etc/nginx/sites-available/disroot.lan.conf
@ -29,7 +29,7 @@ server {
  location ~ /(LICENSE.txt|composer.lock|composer.json|nginx.conf|web.config|htaccess.txt|\.htaccess) { return 403; }

  location ~ \.php$ {
-    fastcgi_pass unix:/var/run/php/php7.3-fpm.sock;
+    fastcgi_pass unix:/var/run/php/php7.4-fpm.sock;
    fastcgi_split_path_info ^(.+\.php)(/.+)$;
    fastcgi_index index.php;
    include fastcgi_params;