From 179d685a0442f3c04d244308cdae675773c823f2 Mon Sep 17 00:00:00 2001
From: Thomas Schwery <thomas@inf3.ch>
Date: Mon, 12 Nov 2018 19:56:12 +0100
Subject: [PATCH 1/2] Fix folder deployment to S3

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2d31856..1f65bc5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,7 +38,7 @@ deploys3-master:
   before_script:
     - pip install awscli
   script:
-    - aws s3 cp . s3://${S3_BUCKET_NAME}/ --recursive
+    - aws s3 cp build s3://${S3_BUCKET_NAME}/ --recursive
   environment:
     name: ${CI_COMMIT_REF_SLUG}
     url: http://${S3_BUCKET_NAME}.s3-website-${AWS_BUCKET_REGION}.amazonaws.com/

From 755dacc339542818fcf364fc896e4c73df9e7400 Mon Sep 17 00:00:00 2001
From: Thomas Schwery <thomas@inf3.ch>
Date: Mon, 12 Nov 2018 20:01:11 +0100
Subject: [PATCH 2/2] Link to index.html instead of naked directory

---
 templates/partials/base.hbs    | 2 +-
 templates/partials/tagList.hbs | 2 +-
 templates/recette.hbs          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/partials/base.hbs b/templates/partials/base.hbs
index f9541b8..562b64b 100644
--- a/templates/partials/base.hbs
+++ b/templates/partials/base.hbs
@@ -21,7 +21,7 @@
         <nav class="navbar navbar-default">
             <div class="container">
                 <div class="navbar-header">
-                    <a class="navbar-brand" href="/">{{#block "title"}} {{/block}}</a>
+                    <a class="navbar-brand" href="/index.html">{{#block "title"}} {{/block}}</a>
                     {{!-- Fixme
                     <div id="navbar" class="navbar-collapse collapse">
                         <ul class="nav navbar-nav navbar-right">
diff --git a/templates/partials/tagList.hbs b/templates/partials/tagList.hbs
index 429a55f..03db903 100644
--- a/templates/partials/tagList.hbs
+++ b/templates/partials/tagList.hbs
@@ -1,4 +1,4 @@
-<a href="/{{ @key }}/" class="list-group-item {{#ifCond @key '==' currentTag }}active{{/ifCond }}">
+<a href="/{{ @key }}/index.html" class="list-group-item {{#ifCond @key '==' currentTag }}active{{/ifCond }}">
     <span class="badge">{{ posts.length }}</span>
     {{ data.title }}
 </a>
diff --git a/templates/recette.hbs b/templates/recette.hbs
index 60c6602..6795b15 100644
--- a/templates/recette.hbs
+++ b/templates/recette.hbs
@@ -21,7 +21,7 @@
         </h1>
         <div class="header-container row">
             <div class="header-category col-sm-4">
-                <a href="/{{ category }}/">{{ categoryPage.data.title }}</a>
+                <a href="/{{ category }}/index.html">{{ categoryPage.data.title }}</a>
             </div>
             <div class="col-sm-2">
             </div>