From 2e871aa930e3a4f064ab4b87586f1f4c59425c1c Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Wed, 16 Oct 2019 00:20:29 +0200 Subject: [PATCH] refactor ci pipeline --- .drone.jsonnet | 5 ++--- .drone.yml | 7 +++---- HEADER.md | 4 ++-- tasks/init.yml | 2 +- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index c9e141d..7d52dc0 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -13,9 +13,8 @@ local PipelineLinting = { PY_COLORS: 1 }, commands: [ - "wget -O .later-standards.py https://gitea.rknet.org/ansible/ansible-later-policy/raw/branch/master/standards.py", - "wget -O .later-defaults.yml https://gitea.rknet.org/ansible/ansible-later-policy/raw/branch/master/config.yml", - "ansible-later -r .later-standards.py -c .later-defaults.yml" + "git clone https://gitea.rknet.org/ansible/ansible-later-policy.git ~/policy", + "ansible-later -c ~/policy/config.yml" ], }, ], diff --git a/.drone.yml b/.drone.yml index d6a3bc1..7b5d5cb 100644 --- a/.drone.yml +++ b/.drone.yml @@ -10,9 +10,8 @@ steps: - name: ansible-later image: xoxys/ansible-later:latest commands: - - wget -O .later-standards.py https://gitea.rknet.org/ansible/ansible-later-policy/raw/branch/master/standards.py - - wget -O .later-defaults.yml https://gitea.rknet.org/ansible/ansible-later-policy/raw/branch/master/config.yml - - ansible-later -r .later-standards.py -c .later-defaults.yml + - git clone https://gitea.rknet.org/ansible/ansible-later-policy.git ~/policy + - ansible-later -c ~/policy/config.yml environment: PY_COLORS: 1 @@ -144,6 +143,6 @@ depends_on: --- kind: signature -hmac: 7fb49660978cc626c642f3dcd19ee7018a6082153bccf5dafadb06e51f29f06a +hmac: 767a52e730e52730b52344e40de7536f2c51f37983c0697ac90d9ed3b8aef588 ... diff --git a/HEADER.md b/HEADER.md index 7ba628d..14563c5 100644 --- a/HEADER.md +++ b/HEADER.md @@ -1,4 +1,4 @@ -# xoxys.MYTPL +# xoxys.certbot -[![Build Status](https://drone.rknet.org/api/badges/ansible/xoxys.MYTPL/status.svg)](https://drone.rknet.org/ansible/xoxys.MYTPL) +[![Build Status](https://drone.rknet.org/api/badges/ansible/xoxys.certbot/status.svg)](https://drone.rknet.org/ansible/xoxys.certbot) diff --git a/tasks/init.yml b/tasks/init.yml index 31f8dc4..efb5e06 100644 --- a/tasks/init.yml +++ b/tasks/init.yml @@ -2,7 +2,7 @@ - name: Initialise certbot block: - name: Initial run of certbot - shell: > + command: > certbot --config-dir {{ certbot_config_dir }} --work-dir {{ certbot_work_dir }}