From 996795a49a2e5f258069eeb7c884df6e4f26c753 Mon Sep 17 00:00:00 2001
From: kleph <kleph@kleph.eu>
Date: Tue, 27 Oct 2020 17:46:45 +0100
Subject: [PATCH] [CI] Add deploy live stage and factorize dpeloy commands

---
 .drone.yml | 58 ++++++++++++++++++++++++++++++------------------------
 1 file changed, 32 insertions(+), 26 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index d9e8eda..25b3646 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,6 +1,6 @@
 ---
 kind: pipeline
-name: lint
+name: build
 
 steps:
 - name: markdown lint
@@ -13,6 +13,19 @@ steps:
   commands:
   - pelican content -o output -s pelicanconf.py
 
+
+---
+deploy_commands:
+- &deploy_commands
+  commands:
+  - echo "deploy $DEPLOY_USER@$DEPLOY_HOST"
+  - echo "$DEPLOY_KEY" | sed 's/!/\n/g' > deploy_key
+  - chmod 0600 deploy_key
+  - ssh -i deploy_key -o StrictHostKeyChecking=no $DEPLOY_USER@$DEPLOY_HOST rm -Rf ${DEPLOY_DIR}/output/
+  - scp -r -i deploy_key -o StrictHostKeyChecking=no output $DEPLOY_USER@$DEPLOY_HOST:${DEPLOY_DIR}
+
+kind: pipeline
+name: deploy
 - name: deploy staging
   image: kroniak/ssh-client
   environment:
@@ -22,33 +35,26 @@ steps:
       from_secret: deploy_host
     DEPLOY_KEY:
       from_secret: deploy_key
-  commands:
-  - echo "deploy $DEPLOY_USER@$DEPLOY_HOST"
-  - echo "$DEPLOY_KEY" | sed 's/!/\n/g' > deploy_key
-  - chmod 0600 deploy_key
-  - ssh -i deploy_key -o StrictHostKeyChecking=no $DEPLOY_USER@$DEPLOY_HOST rm -Rf /srv/http/blog-lan/output/
-  - scp -r -i deploy_key -o StrictHostKeyChecking=no output $DEPLOY_USER@$DEPLOY_HOST:/srv/http/blog-lan/
+    DEPLOY_DIR: /srv/http/blog-lan
+  <<: *deploy_commands
   when:
     branch:
       exclude:
       - master
 
-    #- name: deploy staging
-    #  image: kroniak/ssh-client
-    #  environment:
-    #    DEPLOY_USER:
-    #      from_secret: deploy_user
-    #    DEPLOY_HOST:
-    #      from_secret: deploy_host
-    #    DEPLOY_KEY:
-    #      from_secret: deploy_key
-    #  commands:
-    #  - echo "deploy $DEPLOY_USER@$DEPLOY_HOST"
-    #  - echo "$DEPLOY_KEY" | sed 's/!/\n/g' > deploy_key
-    #  - chmod 0600 deploy_key
-    #  - cat deploy_key
-    #  - scp -i deploy_key -o StrictHostKeyChecking=no output/* $DEPLOY_USER@$DEPLOY_HOST:/srv/http/blog/output/
-    #  when:
-    #    branch:
-    #      include:
-    #      - master
+- name: deploy live
+  image: kroniak/ssh-client
+  environment:
+    DEPLOY_USER:
+      from_secret: deploy_user
+    DEPLOY_HOST:
+      from_secret: deploy_host
+    DEPLOY_KEY:
+      from_secret: deploy_key
+    DEPLOY_DIR: /srv/http/blog
+  commands:
+  <<: *deploy_commands
+  when:
+    branch:
+      include:
+      - master