whitespaces

This commit is contained in:
Jérémy Lecour 2018-04-04 23:21:31 +02:00
parent 20d3afb74a
commit 3cbb65ea8d
12 changed files with 63 additions and 63 deletions

View file

@ -4,8 +4,8 @@
gather_facts: False gather_facts: False
vars: vars:
aws_access_key: aws_access_key:
aws_secret_key: aws_secret_key:
aws_region: ca-central-1 aws_region: ca-central-1
tasks: tasks:

View file

@ -24,7 +24,7 @@ ec2_debian_base_ami:
us-east-1: ami-ac5e55d7 us-east-1: ami-ac5e55d7
us-east-2: ami-9fbb98fa us-east-2: ami-9fbb98fa
us-west-1: ami-560c3836 us-west-1: ami-560c3836
us-west-2: ami-fa18f282 us-west-2: ami-fa18f282
ec2_evolinux_security_group: ec2_evolinux_security_group:
name: evolinux-default name: evolinux-default

View file

@ -108,4 +108,4 @@
replace: 'AllowSupplementaryGroups true' replace: 'AllowSupplementaryGroups true'
notify: restart clamav notify: restart clamav
tags: tags:
- clamav - clamav

View file

@ -76,7 +76,7 @@
# - block: # - block:
# - include_role: # - include_role:
# name: remount-usr # name: remount-usr
# #
# - name: Move kibana optimize directory # - name: Move kibana optimize directory
# shell: "mv /usr/share/kibana/{{ item }} /var/lib/kibana/{{ item }} && ln -s /var/lib/kibana/{{ item }} /usr/share/kibana/{{ item }}" # shell: "mv /usr/share/kibana/{{ item }} /var/lib/kibana/{{ item }} && ln -s /var/lib/kibana/{{ item }} /usr/share/kibana/{{ item }}"
# args: # args:

View file

@ -62,7 +62,7 @@
systemd: systemd:
name: opendkim name: opendkim
state: started state: started
enabled: True enabled: True
tags: tags:
- opendkim - opendkim

View file

@ -65,7 +65,7 @@
dest: /etc/proftpd/conf.d/z-evolinux.conf dest: /etc/proftpd/conf.d/z-evolinux.conf
state: present state: present
line: " AllowUser {{ proftpd_name }}" line: " AllowUser {{ proftpd_name }}"
insertbefore: "DenyAll" insertbefore: "DenyAll"
notify: restart proftpd notify: restart proftpd
tags: tags:
- proftpd - proftpd

View file

@ -4,26 +4,26 @@
name: "{{ item }}" name: "{{ item }}"
state: present state: present
with_items: with_items:
- libpam-systemd - libpam-systemd
- ruby - ruby
- ruby-dev - ruby-dev
- bundler - bundler
- imagemagick - imagemagick
- git-core - git-core
- git-svn - git-svn
- gcc - gcc
- build-essential - build-essential
- libxml2-dev - libxml2-dev
- libxslt1-dev - libxslt1-dev
- libssl-dev - libssl-dev
- libmagickwand-dev - libmagickwand-dev
- libmagickcore-dev - libmagickcore-dev
- libmysqlclient-dev - libmysqlclient-dev
- python-mysqldb - python-mysqldb
tags: tags:
- redmine - redmine
#- name: #- name:
# lineinfile: # lineinfile:
# with_items: # with_items:
# - 'https://github.com/.*' # - 'https://github.com/.*'
@ -38,7 +38,7 @@
dest: /etc/systemd/user/puma.service dest: /etc/systemd/user/puma.service
mode: "0644" mode: "0644"
tags: tags:
- redmine - redmine
- name: Create puma config dir - name: Create puma config dir
file: file:
@ -47,14 +47,14 @@
mode: "0755" mode: "0755"
owner: root owner: root
tags: tags:
- redmine - redmine
- name: Create redmine group - name: Create redmine group
group: group:
name: "{{ redmine_user }}" name: "{{ redmine_user }}"
state: present state: present
tags: tags:
- redmine - redmine
- name: Add www-data to redmine group - name: Add www-data to redmine group
user: user:
@ -62,7 +62,7 @@
groups: "{{ redmine_user }}" groups: "{{ redmine_user }}"
append: yes append: yes
tags: tags:
- redmine - redmine
- name: Create redmine user - name: Create redmine user
user: user:
@ -73,7 +73,7 @@
home: "/home/{{ redmine_user }}" home: "/home/{{ redmine_user }}"
shell: /bin/bash shell: /bin/bash
tags: tags:
- redmine - redmine
- name: Create required directory - name: Create required directory
file: file:
@ -83,11 +83,11 @@
group: "{{ redmine_user }}" group: "{{ redmine_user }}"
mode: "0750" mode: "0750"
with_items: with_items:
- "/home/{{ redmine_user }}" - "/home/{{ redmine_user }}"
- "/home/{{ redmine_user }}/files" - "/home/{{ redmine_user }}/files"
- "/home/{{ redmine_user }}/log" - "/home/{{ redmine_user }}/log"
tags: tags:
- redmine - redmine
- name: Touch Nginx logs file - name: Touch Nginx logs file
file: file:
@ -98,10 +98,10 @@
mode: "0640" mode: "0640"
changed_when: false changed_when: false
with_items: with_items:
- nginx_access.log - nginx_access.log
- nginx_error.log - nginx_error.log
tags: tags:
- redmine - redmine
- name: Enable systemd user mode - name: Enable systemd user mode
command: "loginctl enable-linger {{ redmine_user }}" command: "loginctl enable-linger {{ redmine_user }}"
@ -115,7 +115,7 @@
group: "{{ redmine_user }}" group: "{{ redmine_user }}"
mode: "0640" mode: "0640"
tags: tags:
- redmine - redmine
- name: Update or clone Redmine git - name: Update or clone Redmine git
git: git:
@ -127,7 +127,7 @@
become_user: "{{ redmine_user }}" become_user: "{{ redmine_user }}"
register: redmine_git_task register: redmine_git_task
tags: tags:
- redmine - redmine
- name: Deploy custom Gemfile - name: Deploy custom Gemfile
copy: copy:
@ -145,7 +145,7 @@
changed_when: False changed_when: False
failed_when: false failed_when: false
tags: tags:
- redmine - redmine
- name: Generate Mysql password - name: Generate Mysql password
shell: perl -e 'print map{("a".."z","A".."Z",0..9)[int(rand(62))]}(1..16)' shell: perl -e 'print map{("a".."z","A".."Z",0..9)[int(rand(62))]}(1..16)'
@ -160,7 +160,7 @@
set_fact: set_fact:
redmine_db_pass: "{{ redmine_generate_mysql_password.stdout | default(redmine_get_mysql_password.stdout) }}" redmine_db_pass: "{{ redmine_generate_mysql_password.stdout | default(redmine_get_mysql_password.stdout) }}"
tags: tags:
- redmine - redmine
- name: Create Mysql database - name: Create Mysql database
mysql_db: mysql_db:
@ -168,7 +168,7 @@
config_file: "/root/.my.cnf" config_file: "/root/.my.cnf"
state: present state: present
tags: tags:
- redmine - redmine
- name: Create Mysql user - name: Create Mysql user
mysql_user: mysql_user:
@ -179,7 +179,7 @@
update_password: always update_password: always
state: present state: present
tags: tags:
- redmine - redmine
- name: Store credentials in my.cnf - name: Store credentials in my.cnf
ini_file: ini_file:
@ -195,7 +195,7 @@
- { option: 'database', value: "{{ redmine_db_name }}" } - { option: 'database', value: "{{ redmine_db_name }}" }
- { option: 'password', value: '{{ redmine_db_pass }}' } - { option: 'password', value: '{{ redmine_db_pass }}' }
tags: tags:
- redmine - redmine
- name: Copy configurations file - name: Copy configurations file
template: template:
@ -205,23 +205,23 @@
group: "{{ redmine_user }}" group: "{{ redmine_user }}"
mode: "0640" mode: "0640"
with_items: with_items:
- 'configuration.yml' - 'configuration.yml'
- 'database.yml' - 'database.yml'
- 'additional_environment.rb' - 'additional_environment.rb'
tags: tags:
- redmine - redmine
- name: Install Redmine plugins - name: Install Redmine plugins
include: plugins.yml include: plugins.yml
with_items: "{{ redmine_plugins }}" with_items: "{{ redmine_plugins }}"
tags: tags:
- redmine - redmine
- name: Install Redmine themes - name: Install Redmine themes
include: themes.yml include: themes.yml
with_items: "{{ redmine_themes }}" with_items: "{{ redmine_themes }}"
tags: tags:
- redmine - redmine
- name: Update local gems with bundle - name: Update local gems with bundle
bundler: bundler:
@ -262,7 +262,7 @@
become_method: sudo become_method: sudo
become_flags: '-iu {{ redmine_user }}' become_flags: '-iu {{ redmine_user }}'
tags: tags:
- redmine - redmine
- name: Copy puma config - name: Copy puma config
template: template:
@ -286,7 +286,7 @@
become_method: sudo become_method: sudo
become_flags: '-iu {{ redmine_user }}' become_flags: '-iu {{ redmine_user }}'
tags: tags:
- redmine - redmine
- name: Reload puma service - name: Reload puma service
systemd: systemd:

View file

@ -2,7 +2,7 @@
- name: Copy/Update plugin from archive - name: Copy/Update plugin from archive
unarchive: unarchive:
src: "{{ item.zip }}" src: "{{ item.zip }}"
dest: "/home/{{ redmine_user }}/www/plugins/" dest: "/home/{{ redmine_user }}/www/plugins/"
remote_src: yes remote_src: yes
owner: "{{ redmine_user }}" owner: "{{ redmine_user }}"
group: "{{ redmine_user }}" group: "{{ redmine_user }}"
@ -17,10 +17,10 @@
version: "{{ item.tree | default('master') }}" version: "{{ item.tree | default('master') }}"
register: redmine_plugin_install register: redmine_plugin_install
when: item.git is defined when: item.git is defined
- name: Fix rights on plugin dir - name: Fix rights on plugin dir
file: file:
path: "/home/{{ redmine_user }}/www/plugins/{{ item.git | basename | splitext | first }}" path: "/home/{{ redmine_user }}/www/plugins/{{ item.git | basename | splitext | first }}"
owner: "{{ redmine_user }}" owner: "{{ redmine_user }}"
group: "{{ redmine_user }}" group: "{{ redmine_user }}"
mode: "u=rwX,g=rX,o=" mode: "u=rwX,g=rX,o="

View file

@ -2,7 +2,7 @@
- name: Copy/Update theme from archive - name: Copy/Update theme from archive
unarchive: unarchive:
src: "{{ item.zip }}" src: "{{ item.zip }}"
dest: "/home/{{ redmine_user }}/www/public/themes/" dest: "/home/{{ redmine_user }}/www/public/themes/"
remote_src: yes remote_src: yes
owner: "{{ redmine_user }}" owner: "{{ redmine_user }}"
group: "{{ redmine_user }}" group: "{{ redmine_user }}"
@ -15,10 +15,10 @@
dest: "/home/{{ redmine_user }}/www/public/themes/{{ item.git | basename | splitext | first }}" dest: "/home/{{ redmine_user }}/www/public/themes/{{ item.git | basename | splitext | first }}"
version: "{{ item.tree | default('master') }}" version: "{{ item.tree | default('master') }}"
when: item.git is defined when: item.git is defined
- name: Fix rights on theme dir - name: Fix rights on theme dir
file: file:
path: "/home/{{ redmine_user }}/www/public/themes/{{ item.git | basename | splitext | first }}" path: "/home/{{ redmine_user }}/www/public/themes/{{ item.git | basename | splitext | first }}"
owner: "{{ redmine_user }}" owner: "{{ redmine_user }}"
group: "{{ redmine_user }}" group: "{{ redmine_user }}"
mode: "0750" mode: "0750"

View file

@ -37,7 +37,7 @@
- name: Run newaliases - name: Run newaliases
command: newaliases command: newaliases
when: tomcat_instance_mail_alias | changed when: tomcat_instance_mail_alias | changed
- name: Enable sudo right - name: Enable sudo right
lineinfile: lineinfile:

View file

@ -55,7 +55,7 @@
dest: "{{ evoadminmail_document_root }}/htdocs/config/connect.php" dest: "{{ evoadminmail_document_root }}/htdocs/config/connect.php"
owner: "www-{{ evoadminmail_username }}" owner: "www-{{ evoadminmail_username }}"
group: "{{ evoadminmail_username }}" group: "{{ evoadminmail_username }}"
when: ldap_admin_password is defined when: ldap_admin_password is defined
- name: "Copy conf.php" - name: "Copy conf.php"
template: template:

View file

@ -28,7 +28,7 @@
changed_when: false changed_when: false
- name: Read mysql config from .my.cnf - name: Read mysql config from .my.cnf
set_fact: set_fact:
db_host: "{{ lookup('ini', 'host section=client file=/tmp/wordpress-{{ ansible_user }}.cnf default=127.0.0.1') }}" db_host: "{{ lookup('ini', 'host section=client file=/tmp/wordpress-{{ ansible_user }}.cnf default=127.0.0.1') }}"
db_user: "{{ lookup('ini', 'user section=client file=/tmp/wordpress-{{ ansible_user }}.cnf default={{ ansible_user }}') }}" db_user: "{{ lookup('ini', 'user section=client file=/tmp/wordpress-{{ ansible_user }}.cnf default={{ ansible_user }}') }}"
db_pwd: "{{ lookup('ini', 'password section=client file=/tmp/wordpress-{{ ansible_user }}.cnf') }}" db_pwd: "{{ lookup('ini', 'password section=client file=/tmp/wordpress-{{ ansible_user }}.cnf') }}"
@ -44,7 +44,7 @@
- name: Configure Wordpress (wp-config.php) - name: Configure Wordpress (wp-config.php)
shell: '{{ wordpress_wpcli }} core config --dbhost={{ db_host }} --dbuser={{ db_user }} --dbpass={{ db_pwd }} --dbname={{ db_name }}' shell: '{{ wordpress_wpcli }} core config --dbhost={{ db_host }} --dbuser={{ db_user }} --dbpass={{ db_pwd }} --dbname={{ db_name }}'
args: args:
creates: "{{ ansible_env.HOME }}/www/wp-config.php" creates: "{{ ansible_env.HOME }}/www/wp-config.php"
- name: Configure site - name: Configure site
shell: '{{ wordpress_wpcli }} core install --url={{ wordpress_host | quote }} --title={{ wordpress_title | quote }} --admin_user=admin --admin_password="{{ admin_pwd | quote }}" --admin_email={{ wordpress_email }} --skip-email' shell: '{{ wordpress_wpcli }} core install --url={{ wordpress_host | quote }} --title={{ wordpress_title | quote }} --admin_user=admin --admin_password="{{ admin_pwd | quote }}" --admin_email={{ wordpress_email }} --skip-email'
@ -90,7 +90,7 @@
Votre nouveau site WordPress a bien été installé à ladresse : Votre nouveau site WordPress a bien été installé à ladresse :
http://{{ wordpress_host }} http://{{ wordpress_host }}
Vous pouvez vous y connecter en tant quadministrateur avec les informations suivantes : Vous pouvez vous y connecter en tant quadministrateur avec les informations suivantes :
Identifiant : admin Identifiant : admin