Commit ee20adee authored by Mathieu Lutfy's avatar Mathieu Lutfy Committed by bgm
Browse files

ansible: misc ansible 2.7 compat

parent cdf431ce
......@@ -20,8 +20,8 @@ spark-1.civicrm.org
spark-2.civicrm.org
test.civicrm.org ansible_ssh_host=35.226.128.213
test-ubu1204-1.civicrm.osuosl.org
test-1.civicrm.org # formerly test-ubu1204-5
test-2.civicrm.org # formerly test-ubu1604-1
test-1.civicrm.org
test-2.civicrm.org
test-3.civicrm.org ansible_ssh_host=147.135.121.0
www-cxn-2.civicrm.osuosl.org
www-demo.civicrm.osuosl.org
......@@ -29,11 +29,10 @@ www-prod.civicrm.osuosl.org
www-prod-2.civicrm.org
www-test.civicrm.org
www-demo.civicrm.org
# www-cxn-1.civicrm.org # not managed, but www is monitored by icinga
# training.civicrm.org ansible_ssh_host=192.95.2.133
# svn.civicrm.osuosl.org # still exists, but no longer maintained
# not managed, but www is monitored by icinga
# www-cxn-1.civicrm.org
[nginx-servers]
[nginx_servers]
botdylan.civicrm.org
chat.civicrm.org
spark-1.civicrm.org
......@@ -43,7 +42,7 @@ www-prod.civicrm.osuosl.org
www-prod-2.civicrm.org
www-test.civicrm.org
[apache-servers]
[apache_servers]
java-prod.civicrm.osuosl.org
latest.civicrm.org
test-1.civicrm.org
......@@ -53,10 +52,10 @@ training.civicrm.org
www-demo.civicrm.osuosl.org
www-demo.civicrm.org
[demo-servers]
[demo_servers]
www-demo.civicrm.org
[test-servers]
[test_servers]
test-ubu1204-1.civicrm.osuosl.org
test-ubu1204-2.civicrm.osuosl.org
test-ubu1204-3.civicrm.org
......@@ -64,20 +63,20 @@ test-1.civicrm.org
test-2.civicrm.org
test-3.civicrm.org
[jenkins-servers]
[jenkins_servers]
test.civicrm.org
[backup-servers]
[backup_servers]
backups-1.civicrm.org
newsushi.civicrm.osuosl.org
[mattermost-servers]
[mattermost_servers]
chat.civicrm.org
[stats-servers]
[stats_servers]
latest.civicrm.org
[unclassified-servers]
[unclassified_servers]
botdylan.civicrm.org
cxnapp-2.civicrm.org
lab.civicrm.org
......@@ -85,67 +84,67 @@ manage.civicrm.osuosl.org
test.civicrm.org
www-cxn-2.civicrm.osuosl.org
[kvm-servers]
[kvm_servers]
barbecue.civicrm.org
paella.civicrm.org
[servers:children]
apache-servers
backup-servers
kvm-servers
nginx-servers
test-servers
stats-servers
unclassified-servers
[icinga-satellite:children]
apache_servers
backup_servers
kvm_servers
nginx_servers
test_servers
stats_servers
unclassified_servers
[icinga_satellite:children]
servers
[php72-servers]
[php72_servers]
www-demo.civicrm.org
www-prod.civicrm.osuosl.org
[php7-servers]
[php7_servers]
test-ubu1604-1.civicrm.org
www-demo.civicrm.osuosl.org
# www-test.civicrm.org
[php56-servers]
[php56_servers]
latest.civicrm.org
www-cxn-2.civicrm.osuosl.org
# training.civicrm.org
[php55-servers]
[php55_servers]
test-ubu1204-1.civicrm.osuosl.org
[buildkit-servers]
[buildkit_servers]
training.civicrm.org
[mkdocs-servers]
[mkdocs_servers]
www-prod.civicrm.osuosl.org
[jira-servers]
[jira_servers]
java-prod.civicrm.osuosl.org
[gitlab-servers]
[gitlab_servers]
lab.civicrm.org
[ldap-servers]
[ldap_servers]
manage.civicrm.osuosl.org
[ldapcivi-servers]
[ldapcivi_servers]
www-prod-2.civicrm.org
[aegir-managed]
[aegir_managed]
spark-1.civicrm.org
spark-2.civicrm.org
www-prod-2.civicrm.org
www-test.civicrm.org
[gitbot-servers]
[gitbot_servers]
botdylan.civicrm.org
[dehydrated-manually]
[dehydrated_manually]
botdylan.civicrm.org
chat.civicrm.org
cxnapp-2.civicrm.org
......
......@@ -54,7 +54,7 @@
- demo-buildkit
- name: Download buildkit
sudo_user: webeditor
become_user: webeditor
git: repo=https://github.com/civicrm/civicrm-buildkit.git
version=master
dest=/srv/buildkit
......
......@@ -2,7 +2,7 @@
# Firewall (iptables)
- name: Install ufw
apt: name=ufw state=installed
apt: name=ufw state=present
tags:
- ufw
......
---
- hosts: servers
sudo: yes
become: yes
roles:
- common-all
- icinga2
- backup-client
- filebeat
- mysqlbackup
- ufw
- unattended-upgrades
- sshuserkeys
tags:
- minimum
- hosts: icinga-satellite
sudo: yes
roles:
- icinga2
tags:
- icinga
- icinga2
- hosts: all
sudo: yes
roles:
- backup-client
tags:
- backup-client
- base
- hosts: backup-servers
sudo: yes
become: yes
roles:
- backup-server
tags:
- backup-server
- hosts: kvm-servers
sudo: yes
become: yes
roles:
- common-all
- kvm-server
tags:
- kvm-server
- hosts: mattermost-servers
sudo: yes
become: yes
roles:
- mattermost
tags:
- mattermost
- hosts: test-servers
sudo: yes
become: yes
roles:
- test-node
- gitlab-runner
......@@ -58,7 +42,7 @@
- test-node
- hosts: demo-servers
sudo: yes
become: yes
roles:
- demo
- nodejs
......@@ -66,84 +50,84 @@
- demo
- hosts: php72-servers
sudo: yes
become: yes
roles:
- php72
tags:
- php72
- hosts: php7-servers
sudo: yes
become: yes
roles:
- php7
tags:
- php7
- hosts: php56-servers
sudo: yes
become: yes
roles:
- php56
tags:
- php56
- hosts: php55-servers
sudo: yes
become: yes
roles:
- php55
tags:
- php55
- hosts: php54-servers
sudo: yes
become: yes
roles:
- php54
tags:
- php54
- hosts: buildkit-servers
sudo: yes
become: yes
roles:
- buildkit
tags:
- buildkit
- hosts: mkdocs-servers
sudo: yes
become: yes
roles:
- mkdocs
tags:
- mkdocs
- hosts: jira-servers
sudo: yes
become: yes
roles:
- jira
tags:
- jira
- hosts: gitlab-servers
sudo: yes
become: yes
roles:
- gitlab
tags:
- gitlab
- hosts: stats-servers
sudo: yes
become: yes
roles:
- civicrm-stats
tags:
- civicrm-stats
- hosts: ldap-servers
sudo: yes
become: yes
roles:
- ldap-auth-server
tags:
- ldap-auth-server
- hosts: ldapcivi-servers
sudo: yes
become: yes
roles:
- ldapcivi
- dehydrated
......@@ -151,7 +135,7 @@
- ldapcivi
- hosts: gitbot-servers
sudo: yes
become: yes
roles:
- nodejs
tags:
......@@ -176,7 +160,7 @@
- dehydrated
- hosts: jenkins-servers
sudo: yes
become: yes
roles:
- jenkins
tags:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment