infra/ansible
4
5
Fork 5
Code Issues 6 Pull Requests 3 Activity

cleanup roles

Browse Source
This commit is contained in:
Markus 2019-07-23 12:00:59 +02:00
parent 2153438ec5
commit 43f1633a22
4 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/gogs/tasks/main.yml
View File

@ -4,7 +4,7 @@
apt: name=apt-transport-https apt: name=apt-transport-https
- name: Enable gogs apt-key - name: Enable gogs apt-key
apt_key: url='https://dl.packager.io/srv/pkgr/gogs/key' apt_key: url="https://dl.packager.io/srv/pkgr/gogs/key"
- name: Enable gogs repository - name: Enable gogs repository
apt_repository: repo="deb https://dl.packager.io/srv/deb/pkgr/gogs/pkgr/debian 9 main" apt_repository: repo="deb https://dl.packager.io/srv/deb/pkgr/gogs/pkgr/debian 9 main"

4
roles/hackmd/tasks/main.yml
View File

@ -7,10 +7,10 @@
apt: name=apt-transport-https apt: name=apt-transport-https
- name: Enable nodesource apt-key - name: Enable nodesource apt-key
apt_key: url='https://deb.nodesource.com/gpgkey/nodesource.gpg.key' apt_key: url="https://deb.nodesource.com/gpgkey/nodesource.gpg.key"
- name: Enable nodesource repository - name: Enable nodesource repository
apt_repository: repo='deb https://deb.nodesource.com/node_8.x stretch main' apt_repository: repo="deb https://deb.nodesource.com/node_8.x/ {{ ansible_distribution_release }} main"
- name: Install packages - name: Install packages
apt: name={{ item }} apt: name={{ item }}

25
roles/mail/tasks/main.yml
View File

@ -1,18 +1,14 @@
--- ---
- name: add an apt rspamd key - name: add an apt rspamd key
apt_key: apt_key: url="https://rspamd.com/apt-stable/gpg.key"
url: https://rspamd.com/apt-stable/gpg.key
state: present
- name: add rspamd repository - name: add rspamd repository
apt_repository: apt_repository: repo="deb http://rspamd.com/apt-stable/ {{ ansible_distribution_release }} main"
repo: deb http://rspamd.com/apt-stable/ {{ ansible_distribution_release }} main
state: present
- name: Install packages - name: Install packages
apt: name={{ item }} apt: name={{ item }}
with_items: with_items:
- amavisd-new
- bsd-mailx - bsd-mailx
- dovecot-core - dovecot-core
- dovecot-imapd - dovecot-imapd
@ -45,7 +41,7 @@
- name: Create vmail sieve-bin directory - name: Create vmail sieve-bin directory
file: path=/var/vmail/.sieve/bin state=directory mode=0750 owner=vmail group=vmail file: path=/var/vmail/.sieve/bin state=directory mode=0750 owner=vmail group=vmail
- name: Copy redis config - name: Configure redis
copy: src=redis.conf dest=/etc/redis/redis.conf copy: src=redis.conf dest=/etc/redis/redis.conf
notify: Restart redis notify: Restart redis
@ -57,10 +53,10 @@
- name: Render rspamd config templates - name: Render rspamd config templates
template: src=rspamd/local.d/{{ item }}.j2 dest=/etc/rspamd/local.d/{{ item }} template: src=rspamd/local.d/{{ item }}.j2 dest=/etc/rspamd/local.d/{{ item }}
notify: Restart rspamd notify: Restart rspamd
loop: with_items:
- "options.inc" - options.inc
- "arc.conf" - arc.conf
- "dkim_signing.conf" - dkim_signing.conf
- name: Copy spam learn/unlearn sieve and shell scripts - name: Copy spam learn/unlearn sieve and shell scripts
copy: src=dovecot/{{ item }} dest=/var/vmail/.sieve/{{ item }} copy: src=dovecot/{{ item }} dest=/var/vmail/.sieve/{{ item }}
@ -164,20 +160,15 @@
- name: Start dovecot - name: Start dovecot
service: name=dovecot state=started enabled=yes service: name=dovecot state=started enabled=yes
tags: mail
- name: Start fcgiwrap - name: Start fcgiwrap
service: name=fcgiwrap state=started enabled=yes service: name=fcgiwrap state=started enabled=yes
tags: mail
- name: Start postfix - name: Start postfix
service: name=postfix state=started enabled=yes service: name=postfix state=started enabled=yes
tags: mail
- name: Start redis - name: Start redis
service: name=rspamd state=started enabled=yes service: name=rspamd state=started enabled=yes
tags: mail
- name: Start rspamd - name: Start rspamd
service: name=rspamd state=started enabled=yes service: name=rspamd state=started enabled=yes
tags: mail

2
roles/nextcloud/tasks/main.yml
View File

@ -4,7 +4,7 @@
apt: name=apt-transport-https apt: name=apt-transport-https
- name: Enable sury php apt-key - name: Enable sury php apt-key
apt_key: url='https://packages.sury.org/php/apt.gpg' apt_key: url="https://packages.sury.org/php/apt.gpg"
- name: Enable sury php repository - name: Enable sury php repository
apt_repository: repo="deb https://packages.sury.org/php/ stretch main" apt_repository: repo="deb https://packages.sury.org/php/ stretch main"