Uniformize indentation (whitespaces only)
This commit is contained in:
Aurélien Bompard
parent
eefdd1b23c
commit
13b6d6f85a
2 changed files with 85 additions and 85 deletions
|
|
@ -9,9 +9,9 @@
|
|||
accelerate: True
|
||||
|
||||
vars_files:
|
||||
- /srv/web/infra/ansible/vars/global.yml
|
||||
- "{{ private }}/vars.yml"
|
||||
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
|
||||
- /srv/web/infra/ansible/vars/global.yml
|
||||
- "{{ private }}/vars.yml"
|
||||
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
|
||||
|
||||
tasks:
|
||||
- include: "{{ tasks }}/virt_instance_create.yml"
|
||||
|
|
@ -27,9 +27,9 @@
|
|||
accelerate: True
|
||||
|
||||
vars_files:
|
||||
- /srv/web/infra/ansible/vars/global.yml
|
||||
- "{{ private }}/vars.yml"
|
||||
- "/srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml"
|
||||
- /srv/web/infra/ansible/vars/global.yml
|
||||
- "{{ private }}/vars.yml"
|
||||
- "/srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml"
|
||||
|
||||
roles:
|
||||
- /srv/web/infra/ansible/roles/base
|
||||
|
|
@ -61,28 +61,28 @@
|
|||
sudo: yes
|
||||
sudo_user: postgres
|
||||
vars_files:
|
||||
- /srv/web/infra/ansible/vars/global.yml
|
||||
- "{{ private }}/vars.yml"
|
||||
- "/srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml"
|
||||
- /srv/web/infra/ansible/vars/global.yml
|
||||
- "{{ private }}/vars.yml"
|
||||
- "/srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml"
|
||||
|
||||
tasks:
|
||||
# mailman auto-updates its schema, there can only be one admin user
|
||||
- name: mailman DB user
|
||||
postgresql_user: name=mailmanadmin password={{ mailman_mm_db_pass }}
|
||||
- name: hyperkitty DB admin user
|
||||
postgresql_user: name=hyperkittyadmin password={{ mailman_hk_admin_db_pass }}
|
||||
- name: hyperkitty DB user
|
||||
postgresql_user: name=hyperkittyapp password={{ mailman_hk_db_pass }}
|
||||
- name: kittystore DB admin user
|
||||
postgresql_user: name=kittystoreadmin password={{ mailman_ks_admin_db_pass }}
|
||||
- name: kittystore DB user
|
||||
postgresql_user: name=kittystoreapp password={{ mailman_ks_db_pass }}
|
||||
- name: databases creation
|
||||
postgresql_db: name={{ item }} owner="{{ item }}admin" encoding=UTF-8
|
||||
with_items:
|
||||
- mailman
|
||||
- hyperkitty
|
||||
- kittystore
|
||||
# mailman auto-updates its schema, there can only be one admin user
|
||||
- name: mailman DB user
|
||||
postgresql_user: name=mailmanadmin password={{ mailman_mm_db_pass }}
|
||||
- name: hyperkitty DB admin user
|
||||
postgresql_user: name=hyperkittyadmin password={{ mailman_hk_admin_db_pass }}
|
||||
- name: hyperkitty DB user
|
||||
postgresql_user: name=hyperkittyapp password={{ mailman_hk_db_pass }}
|
||||
- name: kittystore DB admin user
|
||||
postgresql_user: name=kittystoreadmin password={{ mailman_ks_admin_db_pass }}
|
||||
- name: kittystore DB user
|
||||
postgresql_user: name=kittystoreapp password={{ mailman_ks_db_pass }}
|
||||
- name: databases creation
|
||||
postgresql_db: name={{ item }} owner="{{ item }}admin" encoding=UTF-8
|
||||
with_items:
|
||||
- mailman
|
||||
- hyperkitty
|
||||
- kittystore
|
||||
|
||||
|
||||
# Real MM/HK-specific work
|
||||
|
|
@ -92,9 +92,9 @@
|
|||
gather_facts: True
|
||||
|
||||
vars_files:
|
||||
- /srv/web/infra/ansible/vars/global.yml
|
||||
- "{{ private }}/vars.yml"
|
||||
- "/srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml"
|
||||
- /srv/web/infra/ansible/vars/global.yml
|
||||
- "{{ private }}/vars.yml"
|
||||
- "/srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml"
|
||||
|
||||
roles:
|
||||
- /srv/web/infra/ansible/roles/mailman
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
gather_facts: False
|
||||
|
||||
vars_files:
|
||||
- /srv/web/infra/ansible/vars/global.yml
|
||||
- "{{ private }}/vars.yml"
|
||||
- /srv/web/infra/ansible/vars/global.yml
|
||||
- "{{ private }}/vars.yml"
|
||||
|
||||
tasks:
|
||||
- include: "{{ tasks }}/persistent_cloud.yml"
|
||||
|
|
@ -16,11 +16,11 @@
|
|||
gather_facts: True
|
||||
|
||||
vars_files:
|
||||
- /srv/web/infra/ansible/vars/global.yml
|
||||
- "{{ private }}/vars.yml"
|
||||
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
|
||||
- /srv/web/infra/ansible/vars/global.yml
|
||||
- "{{ private }}/vars.yml"
|
||||
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
|
||||
vars:
|
||||
- mailman_vardir: /srv/persist/mailman
|
||||
- mailman_vardir: /srv/persist/mailman
|
||||
|
||||
tasks:
|
||||
- include: "{{ tasks }}/cloud_setup_basic.yml"
|
||||
|
|
@ -45,23 +45,23 @@
|
|||
- name: install packages
|
||||
yum: state=installed name={{ item }}
|
||||
with_items:
|
||||
- httpd
|
||||
- mod_ssl
|
||||
- mod_wsgi
|
||||
- mailman
|
||||
- python-psycopg2
|
||||
- python-storm-postgresql
|
||||
- postgresql-server
|
||||
- system-config-firewall-base
|
||||
- rsync
|
||||
- openssh-clients
|
||||
- httpd-tools
|
||||
- cronie-noanacron
|
||||
- httpd
|
||||
- mod_ssl
|
||||
- mod_wsgi
|
||||
- mailman
|
||||
- python-psycopg2
|
||||
- python-storm-postgresql
|
||||
- postgresql-server
|
||||
- system-config-firewall-base
|
||||
- rsync
|
||||
- openssh-clients
|
||||
- httpd-tools
|
||||
- cronie-noanacron
|
||||
|
||||
- name: install apache and mod_wsgi
|
||||
yum: name=mod_wsgi state=installed
|
||||
notify:
|
||||
- restart apache
|
||||
- restart apache
|
||||
|
||||
- name: erase packages
|
||||
action: yum state=absent name={{ item }}
|
||||
|
|
@ -73,10 +73,10 @@
|
|||
- name: poke holes in the firewall
|
||||
command: lokkit {{ item }}
|
||||
with_items:
|
||||
- --service=ssh
|
||||
- --service=https
|
||||
- --service=http
|
||||
- --service=smtp
|
||||
- --service=ssh
|
||||
- --service=https
|
||||
- --service=http
|
||||
- --service=smtp
|
||||
|
||||
# Database
|
||||
- name: initialize postgresql
|
||||
|
|
@ -85,7 +85,7 @@
|
|||
- name: copy pg_hba.conf
|
||||
copy: src="{{ files }}/lists-dev/pg_hba.conf" dest=/var/lib/pgsql/data/pg_hba.conf
|
||||
notify:
|
||||
- restart postgresql
|
||||
- restart postgresql
|
||||
- name: start postgresql
|
||||
service: state=started name=postgresql
|
||||
|
||||
|
|
@ -100,48 +100,48 @@
|
|||
sudo: yes
|
||||
sudo_user: postgres
|
||||
vars_files:
|
||||
- /srv/web/infra/ansible/vars/global.yml
|
||||
- "{{ private }}/vars.yml"
|
||||
- "{{ vars_path }}/{{ ansible_distribution }}.yml"
|
||||
- /srv/web/infra/ansible/vars/global.yml
|
||||
- "{{ private }}/vars.yml"
|
||||
- "{{ vars_path }}/{{ ansible_distribution }}.yml"
|
||||
vars:
|
||||
- mailman_vardir: /srv/persist/mailman
|
||||
- mailman_vardir: /srv/persist/mailman
|
||||
|
||||
|
||||
tasks:
|
||||
# mailman auto-updates its schema, there can only be one admin user
|
||||
- name: mailman DB user
|
||||
postgresql_user: name=mailmanadmin password={{ lists_dev_mm_db_pass }}
|
||||
- name: hyperkitty DB admin user
|
||||
postgresql_user: name=hyperkittyadmin password={{ lists_dev_hk_db_pass }}
|
||||
- name: hyperkitty DB user
|
||||
postgresql_user: name=hyperkittyapp password={{ lists_dev_hk_db_pass }}
|
||||
- name: kittystore DB admin user
|
||||
postgresql_user: name=kittystoreadmin password={{ lists_dev_ks_db_pass }}
|
||||
- name: kittystore DB user
|
||||
postgresql_user: name=kittystoreapp password={{ lists_dev_ks_db_pass }}
|
||||
- name: databases creation
|
||||
postgresql_db: name={{ item }} owner="{{ item }}admin" encoding=UTF-8
|
||||
with_items:
|
||||
- mailman
|
||||
- hyperkitty
|
||||
- kittystore
|
||||
# mailman auto-updates its schema, there can only be one admin user
|
||||
- name: mailman DB user
|
||||
postgresql_user: name=mailmanadmin password={{ lists_dev_mm_db_pass }}
|
||||
- name: hyperkitty DB admin user
|
||||
postgresql_user: name=hyperkittyadmin password={{ lists_dev_hk_db_pass }}
|
||||
- name: hyperkitty DB user
|
||||
postgresql_user: name=hyperkittyapp password={{ lists_dev_hk_db_pass }}
|
||||
- name: kittystore DB admin user
|
||||
postgresql_user: name=kittystoreadmin password={{ lists_dev_ks_db_pass }}
|
||||
- name: kittystore DB user
|
||||
postgresql_user: name=kittystoreapp password={{ lists_dev_ks_db_pass }}
|
||||
- name: databases creation
|
||||
postgresql_db: name={{ item }} owner="{{ item }}admin" encoding=UTF-8
|
||||
with_items:
|
||||
- mailman
|
||||
- hyperkitty
|
||||
- kittystore
|
||||
|
||||
- name: setup mailman and hyperkitty
|
||||
hosts: hyperkitty-stg
|
||||
gather_facts: no
|
||||
vars_files:
|
||||
- /srv/web/infra/ansible/vars/global.yml
|
||||
- "{{ private }}/vars.yml"
|
||||
- "{{ vars_path }}/{{ ansible_distribution }}.yml"
|
||||
- /srv/web/infra/ansible/vars/global.yml
|
||||
- "{{ private }}/vars.yml"
|
||||
- "{{ vars_path }}/{{ ansible_distribution }}.yml"
|
||||
vars:
|
||||
# override roles variables
|
||||
- mailman_dbserver: localhost
|
||||
- mailman_postfix_mydestination: lists-dev.cloud.fedoraproject.org
|
||||
- mailman_mm_db_pass: {{ lists_dev_mm_db_pass }}
|
||||
- mailman_hk_admin_db_pass: {{ lists_dev_hk_db_pass }}
|
||||
- mailman_hk_db_pass: {{ lists_dev_hk_db_pass }}
|
||||
- mailman_ks_admin_db_pass: {{ lists_dev_ks_db_pass }}
|
||||
- mailman_ks_db_pass: {{ lists_dev_ks_db_pass }}
|
||||
# override roles variables
|
||||
- mailman_dbserver: localhost
|
||||
- mailman_postfix_mydestination: lists-dev.cloud.fedoraproject.org
|
||||
- mailman_mm_db_pass: {{ lists_dev_mm_db_pass }}
|
||||
- mailman_hk_admin_db_pass: {{ lists_dev_hk_db_pass }}
|
||||
- mailman_hk_db_pass: {{ lists_dev_hk_db_pass }}
|
||||
- mailman_ks_admin_db_pass: {{ lists_dev_ks_db_pass }}
|
||||
- mailman_ks_db_pass: {{ lists_dev_ks_db_pass }}
|
||||
|
||||
roles:
|
||||
- /srv/web/infra/ansible/roles/mailman
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue