From e67c80e7b1f72a1231e1d4e3422071a66fef9413 Mon Sep 17 00:00:00 2001 From: Evan Hemsley Date: Sun, 12 Jul 2020 01:02:08 -0700 Subject: [PATCH 01/24] trying it again --- .drone.yml | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/.drone.yml b/.drone.yml index e51d620..0fa199b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2,22 +2,16 @@ kind: pipeline type: docker name: default -steps: -- name: hugo - image: cbrgm/drone-hugo:latest - settings: +pipeline: + build: + image: cbrgm/drone-hugo:latest validate: true - output: public - url: http://moonside.games/docs/encompass + url: https://www.vbrandl.net -- name: deploy - image: appleboy/drone-scp - settings: - host: - - %SCP_HOSTNAME% - port: %SCP_PORT% - username: %SCP_USERNAME% - target: %SCP_TARGET_DIRECTORY% - source: public/ - key: - from_secret: ssh_key + deploy: + image: drillster/drone-rsync + hosts: [ "vbrandl.net" ] + target: /var/www/vbrandl.net + source: public/* + user: hugo + secrets: [ rsync_key ] -- 2.25.1 From 7a001c9faccef9f8c66787501dd9ade4667866a7 Mon Sep 17 00:00:00 2001 From: Evan Hemsley Date: Sun, 12 Jul 2020 01:03:33 -0700 Subject: [PATCH 02/24] fix url --- .drone.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index 0fa199b..b9479b8 100644 --- a/.drone.yml +++ b/.drone.yml @@ -6,12 +6,12 @@ pipeline: build: image: cbrgm/drone-hugo:latest validate: true - url: https://www.vbrandl.net + url: http://moonside.games/docs/encompass deploy: image: drillster/drone-rsync - hosts: [ "vbrandl.net" ] - target: /var/www/vbrandl.net + hosts: [ "moonside.games" ] + target: /var/www/docs/encompass source: public/* user: hugo secrets: [ rsync_key ] -- 2.25.1 From faab741ea435dc587ff7060638eed0721634ca5c Mon Sep 17 00:00:00 2001 From: Evan Hemsley Date: Sun, 12 Jul 2020 01:06:48 -0700 Subject: [PATCH 03/24] git submodule update in drone --- .drone.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.drone.yml b/.drone.yml index b9479b8..99a89e5 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3,6 +3,10 @@ type: docker name: default pipeline: + clone: + commands: + - git submodule update --init --recursive + build: image: cbrgm/drone-hugo:latest validate: true -- 2.25.1 From 52762e4360422e28f447b7f7ee85d46bc2b406b6 Mon Sep 17 00:00:00 2001 From: Evan Hemsley Date: Sun, 12 Jul 2020 01:11:16 -0700 Subject: [PATCH 04/24] more drone BS --- .drone.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 99a89e5..282a3b0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3,14 +3,12 @@ type: docker name: default pipeline: - clone: - commands: - - git submodule update --init --recursive - build: image: cbrgm/drone-hugo:latest validate: true url: http://moonside.games/docs/encompass + commands: + - git submodule update --init --recursive deploy: image: drillster/drone-rsync -- 2.25.1 From 93012ce08d266fdc1743229aae64087bfab4222a Mon Sep 17 00:00:00 2001 From: Evan Hemsley Date: Sun, 12 Jul 2020 01:12:25 -0700 Subject: [PATCH 05/24] trying git plugin --- .drone.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.drone.yml b/.drone.yml index 282a3b0..c79be0f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3,6 +3,10 @@ type: docker name: default pipeline: + clone: + image: plugins/git + recursive: true + build: image: cbrgm/drone-hugo:latest validate: true -- 2.25.1 From eefae74a96b3facda5b96dc632388471944fd149 Mon Sep 17 00:00:00 2001 From: Evan Hemsley Date: Sun, 12 Jul 2020 01:19:03 -0700 Subject: [PATCH 06/24] trying recursive update --- .drone.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.drone.yml b/.drone.yml index c79be0f..a2a0ccf 100644 --- a/.drone.yml +++ b/.drone.yml @@ -4,15 +4,14 @@ name: default pipeline: clone: - image: plugins/git - recursive: true - + image: alpine/git + commands: + - git submodule update --recursive --init + build: image: cbrgm/drone-hugo:latest validate: true url: http://moonside.games/docs/encompass - commands: - - git submodule update --init --recursive deploy: image: drillster/drone-rsync -- 2.25.1 From 1bc26bb10fa9d6d4b7cc00a0b1f67f931ab2c9c5 Mon Sep 17 00:00:00 2001 From: Evan Hemsley Date: Sun, 12 Jul 2020 01:20:37 -0700 Subject: [PATCH 07/24] trying some other shit --- .drone.yml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.drone.yml b/.drone.yml index a2a0ccf..8334dd4 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2,21 +2,21 @@ kind: pipeline type: docker name: default -pipeline: - clone: - image: alpine/git - commands: - - git submodule update --recursive --init +step: +- name: submodules + image: alpine/git + commands: + - git submodule update --recursive --init - build: - image: cbrgm/drone-hugo:latest - validate: true - url: http://moonside.games/docs/encompass +- name: build + image: cbrgm/drone-hugo:latest + validate: true + url: http://moonside.games/docs/encompass - deploy: - image: drillster/drone-rsync - hosts: [ "moonside.games" ] - target: /var/www/docs/encompass - source: public/* - user: hugo - secrets: [ rsync_key ] +- name: deploy + image: drillster/drone-rsync + hosts: [ "moonside.games" ] + target: /var/www/docs/encompass + source: public/* + user: hugo + secrets: [ rsync_key ] -- 2.25.1 From 668a75b46195d8fbfd780349e71a18c22e4581f4 Mon Sep 17 00:00:00 2001 From: Evan Hemsley Date: Sun, 12 Jul 2020 01:21:40 -0700 Subject: [PATCH 08/24] typo --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 8334dd4..de0c915 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2,7 +2,7 @@ kind: pipeline type: docker name: default -step: +steps: - name: submodules image: alpine/git commands: -- 2.25.1 From 71bbf91fa5418e1b00117c925a25f4c6f1c4c50f Mon Sep 17 00:00:00 2001 From: Evan Hemsley Date: Sun, 12 Jul 2020 01:25:45 -0700 Subject: [PATCH 09/24] fix hugo drone config --- .drone.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index de0c915..3f41676 100644 --- a/.drone.yml +++ b/.drone.yml @@ -9,9 +9,10 @@ steps: - git submodule update --recursive --init - name: build - image: cbrgm/drone-hugo:latest - validate: true - url: http://moonside.games/docs/encompass + image: plugins/hugo + settings: + validate: true + url: http://moonside.games/docs/encompass - name: deploy image: drillster/drone-rsync -- 2.25.1 From 918fbbefe0f66f6d01411eebae337e7ba20656ec Mon Sep 17 00:00:00 2001 From: Evan Hemsley Date: Sun, 12 Jul 2020 01:32:02 -0700 Subject: [PATCH 10/24] rsync stuff --- .drone.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 3f41676..85dcb74 100644 --- a/.drone.yml +++ b/.drone.yml @@ -18,6 +18,7 @@ steps: image: drillster/drone-rsync hosts: [ "moonside.games" ] target: /var/www/docs/encompass - source: public/* + source: public/ + recursive: true user: hugo secrets: [ rsync_key ] -- 2.25.1 From 43cf1a6528d98f0f31736a13eeb4c25261896cef Mon Sep 17 00:00:00 2001 From: Evan Hemsley Date: Sun, 12 Jul 2020 01:38:28 -0700 Subject: [PATCH 11/24] rsync condition --- .drone.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 85dcb74..c6958aa 100644 --- a/.drone.yml +++ b/.drone.yml @@ -21,4 +21,8 @@ steps: source: public/ recursive: true user: hugo - secrets: [ rsync_key ] + key: + from_secret: rsync_key + when: + branch: + - main -- 2.25.1 From a5363254f8763144938086cc97bc11e5a1df4bd6 Mon Sep 17 00:00:00 2001 From: Evan Hemsley Date: Sun, 12 Jul 2020 01:46:49 -0700 Subject: [PATCH 12/24] get rid of user param --- .drone.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index c6958aa..d4357dc 100644 --- a/.drone.yml +++ b/.drone.yml @@ -20,7 +20,6 @@ steps: target: /var/www/docs/encompass source: public/ recursive: true - user: hugo key: from_secret: rsync_key when: -- 2.25.1 From 3d6d1eb824e9286985fc58818b5ff86db6febfb9 Mon Sep 17 00:00:00 2001 From: Evan Hemsley Date: Sun, 12 Jul 2020 01:54:33 -0700 Subject: [PATCH 13/24] fix URL --- .drone.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index d4357dc..b661dd0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -16,7 +16,8 @@ steps: - name: deploy image: drillster/drone-rsync - hosts: [ "moonside.games" ] + hosts: + - moonside.games target: /var/www/docs/encompass source: public/ recursive: true -- 2.25.1 From 18131e0486f3577223877e06edcb86ac1df7e4b6 Mon Sep 17 00:00:00 2001 From: Evan Hemsley Date: Sun, 12 Jul 2020 01:56:28 -0700 Subject: [PATCH 14/24] indentation --- .drone.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.drone.yml b/.drone.yml index b661dd0..c4da337 100644 --- a/.drone.yml +++ b/.drone.yml @@ -16,13 +16,14 @@ steps: - name: deploy image: drillster/drone-rsync - hosts: - - moonside.games - target: /var/www/docs/encompass - source: public/ - recursive: true - key: - from_secret: rsync_key + settings: + hosts: + - moonside.games + target: /var/www/docs/encompass + source: public/ + recursive: true + key: + from_secret: rsync_key when: branch: - main -- 2.25.1 From f8650d27c73ddbdeecafa5c262d1e0927ac2d9dc Mon Sep 17 00:00:00 2001 From: Evan Hemsley Date: Sun, 12 Jul 2020 01:57:38 -0700 Subject: [PATCH 15/24] more rysnc config --- .drone.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index c4da337..313a8b7 100644 --- a/.drone.yml +++ b/.drone.yml @@ -16,14 +16,16 @@ steps: - name: deploy image: drillster/drone-rsync + environment: + RSYNC_KEY: + from_secret: rsync_key + RSYNC_USER: hugo settings: hosts: - moonside.games target: /var/www/docs/encompass source: public/ recursive: true - key: - from_secret: rsync_key when: branch: - main -- 2.25.1 From 9a726904f2c3640012b2f37513f2dbe2398160cd Mon Sep 17 00:00:00 2001 From: Evan Hemsley Date: Sun, 12 Jul 2020 01:59:19 -0700 Subject: [PATCH 16/24] remove env --- .drone.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 313a8b7..27013e1 100644 --- a/.drone.yml +++ b/.drone.yml @@ -16,16 +16,15 @@ steps: - name: deploy image: drillster/drone-rsync - environment: - RSYNC_KEY: - from_secret: rsync_key - RSYNC_USER: hugo settings: hosts: - moonside.games target: /var/www/docs/encompass source: public/ recursive: true + user: hugo + key: + from_secret: rsync_key when: branch: - main -- 2.25.1 From 1b65227dc298ad1c04cd253670ec086626dfbc47 Mon Sep 17 00:00:00 2001 From: Evan Hemsley Date: Sun, 12 Jul 2020 02:06:09 -0700 Subject: [PATCH 17/24] trying to access secret --- .drone.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 27013e1..61224cd 100644 --- a/.drone.yml +++ b/.drone.yml @@ -23,8 +23,7 @@ steps: source: public/ recursive: true user: hugo - key: - from_secret: rsync_key + key: ${rsync_key} when: branch: - main -- 2.25.1 From 2c3f6673c5308a2488066445fed42396af52b9e5 Mon Sep 17 00:00:00 2001 From: Evan Hemsley Date: Sun, 12 Jul 2020 02:13:57 -0700 Subject: [PATCH 18/24] hmm --- .drone.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 61224cd..328137e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -23,7 +23,18 @@ steps: source: public/ recursive: true user: hugo - key: ${rsync_key} + secrets: [ rsync_key ] when: branch: - main + +# - name: deploy +# image: appleboy/drone-scp +# settings: +# host: moonside.games +# username: hugo +# key: +# from_secret: rsync_key +# port: 22 +# target: /var/www/html/docs/encompass +# source: -- 2.25.1 From 1c94825015c0c6b82be4981c9df92957ba574fe5 Mon Sep 17 00:00:00 2001 From: Evan Hemsley Date: Sun, 12 Jul 2020 02:19:25 -0700 Subject: [PATCH 19/24] lets try scp instead --- .drone.yml | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/.drone.yml b/.drone.yml index 328137e..af7db8a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -14,27 +14,27 @@ steps: validate: true url: http://moonside.games/docs/encompass -- name: deploy - image: drillster/drone-rsync - settings: - hosts: - - moonside.games - target: /var/www/docs/encompass - source: public/ - recursive: true - user: hugo - secrets: [ rsync_key ] - when: - branch: - - main - # - name: deploy -# image: appleboy/drone-scp +# image: drillster/drone-rsync # settings: -# host: moonside.games -# username: hugo -# key: -# from_secret: rsync_key -# port: 22 -# target: /var/www/html/docs/encompass -# source: +# hosts: +# - moonside.games +# target: /var/www/docs/encompass +# source: public/ +# recursive: true +# user: hugo +# secrets: [ rsync_key ] +# when: +# branch: +# - main + +- name: deploy + image: appleboy/drone-scp + settings: + host: moonside.games + username: hugo + key: + from_secret: rsync_key + port: 22 + target: /var/www/html/docs/encompass + source: ./public -- 2.25.1 From 133ef9c77d64e34dc8871064646d92fcef054f3d Mon Sep 17 00:00:00 2001 From: Evan Hemsley Date: Sun, 12 Jul 2020 02:21:09 -0700 Subject: [PATCH 20/24] lol --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index af7db8a..03970c7 100644 --- a/.drone.yml +++ b/.drone.yml @@ -35,6 +35,7 @@ steps: username: hugo key: from_secret: rsync_key + passphrase: port: 22 target: /var/www/html/docs/encompass source: ./public -- 2.25.1 From 5ca44a0ceb9bf57b180a8c3bd0cbb5caf26eccc2 Mon Sep 17 00:00:00 2001 From: Evan Hemsley Date: Sun, 12 Jul 2020 02:25:51 -0700 Subject: [PATCH 21/24] trying just passphrase --- .drone.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 03970c7..e0e6786 100644 --- a/.drone.yml +++ b/.drone.yml @@ -33,9 +33,8 @@ steps: settings: host: moonside.games username: hugo - key: - from_secret: rsync_key passphrase: + from_secret: scp_key port: 22 target: /var/www/html/docs/encompass source: ./public -- 2.25.1 From e755196a3171ecc930e70b09e9113bc992623e49 Mon Sep 17 00:00:00 2001 From: Evan Hemsley Date: Sun, 12 Jul 2020 02:26:51 -0700 Subject: [PATCH 22/24] lol --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index e0e6786..f4c071b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -33,7 +33,7 @@ steps: settings: host: moonside.games username: hugo - passphrase: + password: from_secret: scp_key port: 22 target: /var/www/html/docs/encompass -- 2.25.1 From 221ec2829577691740a0a3ad68ff353093cb8654 Mon Sep 17 00:00:00 2001 From: Evan Hemsley Date: Sun, 12 Jul 2020 02:43:47 -0700 Subject: [PATCH 23/24] lol --- .drone.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index f4c071b..d27d104 100644 --- a/.drone.yml +++ b/.drone.yml @@ -33,8 +33,7 @@ steps: settings: host: moonside.games username: hugo - password: - from_secret: scp_key + password: scp_key port: 22 target: /var/www/html/docs/encompass source: ./public -- 2.25.1 From 202f21b7e42a4bff50a8fd69c16f31e0053df89e Mon Sep 17 00:00:00 2001 From: Evan Hemsley Date: Sun, 12 Jul 2020 02:47:52 -0700 Subject: [PATCH 24/24] its fine --- .drone.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index d27d104..f4c071b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -33,7 +33,8 @@ steps: settings: host: moonside.games username: hugo - password: scp_key + password: + from_secret: scp_key port: 22 target: /var/www/html/docs/encompass source: ./public -- 2.25.1