add new drone config; fix small design issues
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
Robert Kaussow 2019-06-18 10:46:05 +02:00
parent 080f1ba7f4
commit d3a2b0ac28
7 changed files with 161 additions and 28 deletions

69
.drone.jsonnet Normal file
View File

@ -0,0 +1,69 @@
local AnsibleVersions(version="latest", package="ansible") = {
name: "ansible-" + version,
image: "python:3.7",
pull: "always",
environment: {
PY_COLORS: 1
},
commands: [
"pip install " + package + " ansible-later~=0.2.0 -qq",
"git clone https://gitea.rknet.org/ansible/ansible-later-policy.git ~/policy",
"ansible-later -c ~/policy/config.yml"
],
depends_on: [
"clone",
],
};
local PipelineLinting = {
kind: "pipeline",
name: "linting",
platform: {
os: "linux",
arch: "amd64",
},
steps: [
AnsibleVersions(version="latest", package="ansible"),
AnsibleVersions(version="master", package="git+https://github.com/ansible/ansible.git@devel"),
],
trigger: {
ref: ["refs/heads/master", "refs/tags/**", "refs/pull/**"],
},
};
local PipelineNotifications = {
kind: "pipeline",
name: "notifications",
platform: {
os: "linux",
arch: "amd64",
},
clone: {
disable: true,
},
steps: [
{
name: "matrix",
image: "plugins/matrix",
settings: {
homeserver: "https://matrix.rknet.org",
roomid: "MtidqQXWWAtQcByBhH:rknet.org",
template: "Status: **{{ build.status }}**<br/> Build: [{{ repo.Owner }}/{{ repo.Name }}]({{ build.link }}) ({{ build.branch }}) by {{ build.author }}<br/> Message: {{ build.message }}",
username: { "from_secret": "matrix_username" },
password: { "from_secret": "matrix_password" },
},
},
],
depends_on: [
"linting",
],
trigger: {
status: [ "success", "failure" ],
ref: ["refs/heads/master", "refs/tags/**"],
},
};
[
PipelineLinting,
PipelineNotifications,
]

View File

@ -1,22 +1,78 @@
--- ---
kind: pipeline kind: pipeline
name: default name: linting
platform:
os: linux
arch: amd64
steps: steps:
- name: ansible-latest - name: ansible-latest
image: python:2.7
pull: always pull: always
image: python:3.7
commands: commands:
- pip install ansible ansible-later -q - pip install ansible ansible-later~=0.2.0 -qq
- git clone https://gitea.rknet.org/ansible/ansible-later-policy.git ~/policy - git clone https://gitea.rknet.org/ansible/ansible-later-policy.git ~/policy
- git ls-files *[^LICENSE,.md] | xargs ansible-later -c ~/policy/config.ini - ansible-later -c ~/policy/config.yml
depends_on: [ clone ] environment:
PY_COLORS: 1
depends_on:
- clone
- name: ansible-master - name: ansible-master
image: python:2.7
pull: always pull: always
image: python:3.7
commands: commands:
- pip install ansible ansible-later -q - "pip install git+https://github.com/ansible/ansible.git@devel ansible-later~=0.2.0 -qq"
- git clone https://gitea.rknet.org/ansible/ansible-later-policy.git ~/policy - git clone https://gitea.rknet.org/ansible/ansible-later-policy.git ~/policy
- git ls-files *[^LICENSE,.md] | xargs ansible-later -c ~/policy/config.ini - ansible-later -c ~/policy/config.yml
depends_on: [ clone ] environment:
PY_COLORS: 1
depends_on:
- clone
trigger:
ref:
- refs/heads/master
- "refs/tags/**"
- "refs/pull/**"
---
kind: pipeline
name: notifications
platform:
os: linux
arch: amd64
clone:
disable: true
steps:
- name: matrix
image: plugins/matrix
settings:
homeserver: https://matrix.rknet.org
password:
from_secret: matrix_password
roomid: MtidqQXWWAtQcByBhH:rknet.org
template: "Status: **{{ build.status }}**<br/> Build: [{{ repo.Owner }}/{{ repo.Name }}]({{ build.link }}) ({{ build.branch }}) by {{ build.author }}<br/> Message: {{ build.message }}"
username:
from_secret: matrix_username
trigger:
ref:
- refs/heads/master
- "refs/tags/**"
status:
- success
- failure
depends_on:
- linting
---
kind: signature
hmac: 687734cdf50961bf62d00f2fef97c004cd6b0f3dd6452da8ce4c9a08680992b5
...

View File

@ -10,3 +10,7 @@ postfix_relay_sasl_passwd: secure
postfix_relay_smtpd_banner: postfix_relay_smtpd_banner:
- ESMTP - ESMTP
- $mail_name - $mail_name
postfix_relay_senders:
- user: root
address: "{{ ansible_hostname }}@{{ postfix_relay_sasl_domain }}"

View File

@ -1,13 +1,8 @@
--- ---
- name: Install postfix mta - name: Install required postfix packages
block:
- name: Install required packages
package: package:
name: "{{ item }}" name: "{{ item }}"
state: present state: present
with_items: loop: "{{ __postfix_relay_packages }}"
- postfix
- cyrus-sasl-plain
- mailx
become: True become: True
become_user: root become_user: root

View File

@ -1,3 +1,4 @@
#jinja2: lstrip_blocks: True
# {{ ansible_managed }} # {{ ansible_managed }}
[{{ postfix_relay_sasl_host }}]:{{ postfix_relay_sasl_port }} {{ postfix_relay_sasl_user }}@{{ postfix_relay_sasl_domain }}:{{ postfix_relay_sasl_passwd }} [{{ postfix_relay_sasl_host }}]:{{ postfix_relay_sasl_port }} {{ postfix_relay_sasl_user }}@{{ postfix_relay_sasl_domain }}:{{ postfix_relay_sasl_passwd }}

View File

@ -1,3 +1,6 @@
#jinja2: lstrip_blocks: True
# {{ ansible_managed }} # {{ ansible_managed }}
root {{ ansible_hostname }}@{{ postfix_relay_sasl_domain }} {% for sender in postfix_relay_senders %}
{{ sender.name }} {{ sender.address }}
{% endfor %}

5
vars/main.yml Normal file
View File

@ -0,0 +1,5 @@
---
__postfix_relay_packages:
- postfix
- cyrus-sasl-plain
- mailx