diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 659b5b2364b26d6a5356a359c7a4d68077ba9220..beaa4de413c7aed11473873b3ff5298bc4cc68f8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,13 +9,13 @@ pages: # Unpack the zola executable - tar -xzf zola.tar.gz # Execute zola build - - ./zola build --base-url dunitrust_website.duniter.io - + - ./zola build --base-url https://dunitrust_website.duniter.io/ + artifacts: paths: # Path of our artifacts - public - + # This config will only publish changes that are pushed on the master branch only: - master diff --git a/README.md b/README.md index 33506553bdebf32b7a5bac028226e56db8f9a049..f004acbdc53b59e883756e279e54e40a7023a738 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,21 @@ Consultez ensuite [http://localhost:1111/](http://localhost:1111/) dans votre na > aperçu du site +## Deploiement + +Le site est conçu pour résider à la racine de son nom de domaine. Pour déployer, construisez le site avec + +``` +zola build --base_url example.com +``` + +enfin, poussez vos fichiers statiques avec + +``` +rsync -avc --delete public/ http://example.com:/var/www/ +``` + +Vous pouvez consulter une preview du site à l'adresse : [http://dunitrust.trentesaux.fr/](http://dunitrust.trentesaux.fr/). ## TODO diff --git a/content/home.md b/content/_index.md similarity index 100% rename from content/home.md rename to content/_index.md diff --git a/templates/index.html b/templates/index.html index 88e8d864d32ce41c177daae2eacce0e86f42f704..c37082d8745970798a1770e96af3a4d52fe963ac 100644 --- a/templates/index.html +++ b/templates/index.html @@ -18,7 +18,7 @@ <nav class="navbar" role="navigation" aria-label="main navigation"> <div class="container"> <div class="navbar-brand"> - <a class="navbar-item" href="/"> + <a class="navbar-item" href="{{ get_url(path="@/_index.md") }}"> <img src="{{ get_url(path="dunitrust.png") }}" height="28"> <strong>Dunitrust</strong> </a> @@ -30,10 +30,10 @@ </div> <div id="navbarDunitrust" class="navbar-menu"> <div class="navbar-start"> - <a class="navbar-item" href="/home/"> + <a class="navbar-item" href="{{ get_url(path="@/_index.md") }}"> Accueil </a> - <a class="navbar-item" href="/news/"> + <a class="navbar-item" href="{{ get_url(path="@/_index.md") }}"> News </a> </div> @@ -51,7 +51,7 @@ Plus </a> <div class="navbar-dropdown"> - <a class="navbar-item" href="/about/"> + <a class="navbar-item" href="{{ get_url(path="@/about.md") }}"> À propos </a> <a class="navbar-item"> @@ -74,7 +74,6 @@ <article class="page-content"> {% block content %} - <script>document.location.href="/home/"</script> {% endblock content %} </article> @@ -84,7 +83,7 @@ Site web réalisé par Axiom Team </div> <div class="level-item"> - <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/"><img alt="Licence Creative Commons" style="border-width:0" src="https://i.creativecommons.org/l/by-nc-sa/4.0/80x15.png" /></a>. + <a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/"><img alt="Licence Creative Commons" style="border-width:0" src="https://i.creativecommons.org/l/by-sa/4.0/80x15.png" /></a>. </div> </div> </footer> diff --git a/templates/landing.html b/templates/landing.html index fca9f528486be53cdd8496b5764649fbe1c00404..7e6bd0481499d162e4c886f86b93cbe57cf19d3a 100644 --- a/templates/landing.html +++ b/templates/landing.html @@ -11,14 +11,14 @@ <img src="{{ get_url(path="dunitrust.png") }}"/> <div> <h2 class="title"> Télécharger Dunitrust </h2> - <a class="dl-button stable" href="{{ page.extra.dunitrust_release }}" target="_blank"> + <a class="dl-button stable" href="{{ section.extra.dunitrust_release }}" target="_blank"> <span class="icon is-medium"><i class="fa fa-cloud-download"></i></span> - <span>{{ page.extra.dunitrust_current }}</span><br> + <span>{{ section.extra.dunitrust_current }}</span><br> <span>Réseau Ğ1-TEST</span> </a> - <a class="dl-button beta" href="{{ page.extra.dunitrust_release }}" target="_blank"> + <a class="dl-button beta" href="{{ section.extra.dunitrust_release }}" target="_blank"> <span class="icon is-medium"><i class="fa fa-cloud-download"></i></span> - <span>{{ page.extra.dunitrust_beta }}</span><br> + <span>{{ section.extra.dunitrust_beta }}</span><br> <span>Réseau Ğ1 réel</span> </a> </div>