From 6f023813bec962b04f61098da0bb7c6a298659e0 Mon Sep 17 00:00:00 2001
From: Ad5001 <mail@ad5001.eu>
Date: Sun, 8 Aug 2021 22:50:11 +0200
Subject: [PATCH] Trying new method via SCP, automated building, and less
 server side configuration necessary.

---
 .gitignore        |  2 +-
 ci/dev.config.yml | 72 -----------------------------------
 ci/drone.yml      | 97 +++++++++++++++++++++++++++++------------------
 themes/omegamma   |  1 +
 4 files changed, 62 insertions(+), 110 deletions(-)
 delete mode 100644 ci/dev.config.yml
 create mode 160000 themes/omegamma

diff --git a/.gitignore b/.gitignore
index e7b3c8d..fdd5177 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 *.kdev4
 kdev4
-themes
+themes/Omegamma
 public
 resources
diff --git a/ci/dev.config.yml b/ci/dev.config.yml
deleted file mode 100644
index 6fe3029..0000000
--- a/ci/dev.config.yml
+++ /dev/null
@@ -1,72 +0,0 @@
-baseURL: https://dev.ad5001.eu
-languageCode: en
-title: Ad5001
-theme: Omegamma
-copyright: Copyright © Ad5001 2021
-enableGitInfo: "true"
-
-frontmatter:
-    date: ["date", "publishDate", "lastmod"]
-    lastmod: [":git", "date", "publishDate"]
-      
-params:
-    brandWebsite: /
-    websiteSource: https://git.ad5001.eu/Ad5001/ad5001.eu
-    poweredBy: Powered by
-
-languages:
-    en:
-        languageName: English
-        menu:        
-            main:
-            - identifier: apps
-              name: Apps
-              pre: <i class="icon-apps icon-as-text" alt="apps icon"></i>
-              title: apps section
-              url: https://apps.ad5001.eu/
-              weight: 20
-            - identifier: git
-              name: Git
-              pre: <i class="icon-git icon-as-text" alt="git icon"></i>
-              title: git section
-              url: https://git.ad5001.eu
-              weight: 10
-            - identifier: about
-              name: About
-              pre: <i class="icon-about icon-as-text" alt="about icon"></i>
-              title: about section
-              url: /about
-              weight: 0
-        weight: 0
-    fr:
-        languageName: Français
-        menu:        
-            main:
-            - identifier: apps
-              name: Apps
-              pre: <i class="icon-apps icon-as-text" alt="apps icon"></i>
-              title: apps list section
-              url: https://apps.ad5001.eu/fr/
-              weight: 20
-            - identifier: git
-              name: Git
-              pre: <i class="icon-git icon-as-text" alt="git icon"></i>
-              title: git section
-              url: https://git.ad5001.eu
-              weight: 10
-            - identifier: about
-              name: À propos
-              pre: <i class="icon-about icon-as-text" alt="about icon"></i>
-              title: about section
-              url: /fr/a-propos
-              weight: 0
-        weight: 0
-    
-markup:
-  goldmark:
-    renderer:
-      hardWraps: false
-      unsafe: true
-      xhtml: false
-
-
diff --git a/ci/drone.yml b/ci/drone.yml
index e8934d1..fc86d6b 100644
--- a/ci/drone.yml
+++ b/ci/drone.yml
@@ -1,44 +1,67 @@
 kind: pipeline
-type: ssh
 name: default
 
+clone:
+    git:
+        image: plugins/git
+        recursive: true
+
 server:
-  host:
-    from_secret: SSH_HOST
-  user:
-    from_secret: SSH_USERNAME
-  password:
-    from_secret: SSH_PASSWORD
+    host:
+        from_secret: SSH_HOST
+    user:
+        from_secret: SSH_USERNAME
+    password:
+        from_secret: SSH_PASSWORD
 
 steps:
-- name: Deploy on dev.ad5001.eu
-  environment:
-    DEV_WWW_PATH:
-      from_secret: DEV_WWW_PATH
-  commands:
-  - cd "$DEV_WWW_PATH"
-  - git pull
-  - cd themes/Omegamma
-  - git pull
-  - cd ../..
-  - rm -rf public
-  - hugo --config ci/dev.config.yml
-  when:
-    event: [ push, tag ]
-    branch: [ master ]
+  - name: Build dev.ad5001.eu
+    image: plugins/hugo
+    settings:
+        hugo_version: 0.80
+        validate: true
+        url: https://dev.ad5001.eu
+    when:
+        event: [ push, tag ]
+        branch: [ master ]
 
-- name: Deploy on ad5001.eu
-  environment:
-    PROD_WWW_PATH:
-      from_secret: PROD_WWW_PATH
-  commands:
-  - cd "$PROD_WWW_PATH"
-  - git pull
-  - cd themes/Omegamma
-  - git pull
-  - cd ../..
-  - rm -rf public
-  - hugo
-  when:
-    event: [ push, tag ]
-    branch: [ prod ]
+  - name: Deploy dev.ad5001.eu
+    image: appleboy/drone-scp
+    settings:
+        host:
+            from_secret: SSH_HOST
+        username:
+            from_secret: SSH_USERNAME
+        password:
+            from_secret: SSH_PASSWORD
+        target:
+            from_secret: DEV_WWW_PATH
+        source: public/*
+    when:
+        event: [ push, tag ]
+        branch: [ master ]
+
+  - name: Build ad5001.eu
+    image: plugins/hugo
+    settings:
+        hugo_version: 0.80
+        validate: true
+    when:
+        event: [ push, tag ]
+        branch: [ prod ]
+
+  - name: Deploy ad5001.eu
+    image: appleboy/drone-scp
+    settings:
+        host:
+            from_secret: SSH_HOST
+        username:
+            from_secret: SSH_USERNAME
+        password:
+            from_secret: SSH_PASSWORD
+        target:
+            from_secret: PROD_WWW_PATH
+        source: public/*
+    when:
+        event: [ push, tag ]
+        branch: [ prod ]
diff --git a/themes/omegamma b/themes/omegamma
new file mode 160000
index 0000000..cf25bd9
--- /dev/null
+++ b/themes/omegamma
@@ -0,0 +1 @@
+Subproject commit cf25bd95fb2d9448939d58966a62225b82911cc0