Browse Source

whitespaces

backup/jlecour/ssh-groups
Jérémy Lecour 2 years ago
parent
commit
3cbb65ea8d
12 changed files with 63 additions and 63 deletions
  1. +2
    -2
      amazon-ec2/amazon-ec2-evolinux.yml
  2. +1
    -1
      amazon-ec2/defaults/main.yml
  3. +1
    -1
      clamav/tasks/main.yml
  4. +1
    -1
      kibana/tasks/main.yml
  5. +1
    -1
      opendkim/tasks/main.yml
  6. +1
    -1
      proftpd/tasks/account.yml
  7. +45
    -45
      redmine/tasks/main.yml
  8. +3
    -3
      redmine/tasks/plugins.yml
  9. +3
    -3
      redmine/tasks/themes.yml
  10. +1
    -1
      tomcat-instance/tasks/user.yml
  11. +1
    -1
      webapps/evoadmin-mail/tasks/user.yml
  12. +3
    -3
      webapps/wordpress/tasks/main.yml

+ 2
- 2
amazon-ec2/amazon-ec2-evolinux.yml View File

@@ -4,8 +4,8 @@
gather_facts: False

vars:
aws_access_key:
aws_secret_key:
aws_access_key:
aws_secret_key:
aws_region: ca-central-1

tasks:


+ 1
- 1
amazon-ec2/defaults/main.yml View File

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

ec2_evolinux_security_group:
name: evolinux-default


+ 1
- 1
clamav/tasks/main.yml View File

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

+ 1
- 1
kibana/tasks/main.yml View File

@@ -76,7 +76,7 @@
# - block:
# - include_role:
# name: remount-usr
#
#
# - 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 }}"
# args:


+ 1
- 1
opendkim/tasks/main.yml View File

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



+ 1
- 1
proftpd/tasks/account.yml View File

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

+ 45
- 45
redmine/tasks/main.yml View File

@@ -4,26 +4,26 @@
name: "{{ item }}"
state: present
with_items:
- libpam-systemd
- ruby
- ruby-dev
- bundler
- imagemagick
- git-core
- git-svn
- gcc
- build-essential
- libxml2-dev
- libxslt1-dev
- libssl-dev
- libmagickwand-dev
- libmagickcore-dev
- libmysqlclient-dev
- python-mysqldb
- libpam-systemd
- ruby
- ruby-dev
- bundler
- imagemagick
- git-core
- git-svn
- gcc
- build-essential
- libxml2-dev
- libxslt1-dev
- libssl-dev
- libmagickwand-dev
- libmagickcore-dev
- libmysqlclient-dev
- python-mysqldb
tags:
- redmine
- redmine

#- name:
#- name:
# lineinfile:
# with_items:
# - 'https://github.com/.*'
@@ -38,7 +38,7 @@
dest: /etc/systemd/user/puma.service
mode: "0644"
tags:
- redmine
- redmine

- name: Create puma config dir
file:
@@ -47,14 +47,14 @@
mode: "0755"
owner: root
tags:
- redmine
- redmine

- name: Create redmine group
group:
name: "{{ redmine_user }}"
state: present
tags:
- redmine
- redmine

- name: Add www-data to redmine group
user:
@@ -62,7 +62,7 @@
groups: "{{ redmine_user }}"
append: yes
tags:
- redmine
- redmine

- name: Create redmine user
user:
@@ -73,7 +73,7 @@
home: "/home/{{ redmine_user }}"
shell: /bin/bash
tags:
- redmine
- redmine

- name: Create required directory
file:
@@ -83,11 +83,11 @@
group: "{{ redmine_user }}"
mode: "0750"
with_items:
- "/home/{{ redmine_user }}"
- "/home/{{ redmine_user }}/files"
- "/home/{{ redmine_user }}/log"
- "/home/{{ redmine_user }}"
- "/home/{{ redmine_user }}/files"
- "/home/{{ redmine_user }}/log"
tags:
- redmine
- redmine

- name: Touch Nginx logs file
file:
@@ -98,10 +98,10 @@
mode: "0640"
changed_when: false
with_items:
- nginx_access.log
- nginx_error.log
- nginx_access.log
- nginx_error.log
tags:
- redmine
- redmine

- name: Enable systemd user mode
command: "loginctl enable-linger {{ redmine_user }}"
@@ -115,7 +115,7 @@
group: "{{ redmine_user }}"
mode: "0640"
tags:
- redmine
- redmine

- name: Update or clone Redmine git
git:
@@ -127,7 +127,7 @@
become_user: "{{ redmine_user }}"
register: redmine_git_task
tags:
- redmine
- redmine

- name: Deploy custom Gemfile
copy:
@@ -145,7 +145,7 @@
changed_when: False
failed_when: false
tags:
- redmine
- redmine

- name: Generate Mysql password
shell: perl -e 'print map{("a".."z","A".."Z",0..9)[int(rand(62))]}(1..16)'
@@ -160,7 +160,7 @@
set_fact:
redmine_db_pass: "{{ redmine_generate_mysql_password.stdout | default(redmine_get_mysql_password.stdout) }}"
tags:
- redmine
- redmine

- name: Create Mysql database
mysql_db:
@@ -168,7 +168,7 @@
config_file: "/root/.my.cnf"
state: present
tags:
- redmine
- redmine

- name: Create Mysql user
mysql_user:
@@ -179,7 +179,7 @@
update_password: always
state: present
tags:
- redmine
- redmine

- name: Store credentials in my.cnf
ini_file:
@@ -195,7 +195,7 @@
- { option: 'database', value: "{{ redmine_db_name }}" }
- { option: 'password', value: '{{ redmine_db_pass }}' }
tags:
- redmine
- redmine

- name: Copy configurations file
template:
@@ -205,23 +205,23 @@
group: "{{ redmine_user }}"
mode: "0640"
with_items:
- 'configuration.yml'
- 'database.yml'
- 'additional_environment.rb'
- 'configuration.yml'
- 'database.yml'
- 'additional_environment.rb'
tags:
- redmine
- redmine

- name: Install Redmine plugins
include: plugins.yml
with_items: "{{ redmine_plugins }}"
tags:
- redmine
- redmine

- name: Install Redmine themes
include: themes.yml
with_items: "{{ redmine_themes }}"
tags:
- redmine
- redmine

- name: Update local gems with bundle
bundler:
@@ -262,7 +262,7 @@
become_method: sudo
become_flags: '-iu {{ redmine_user }}'
tags:
- redmine
- redmine

- name: Copy puma config
template:
@@ -286,7 +286,7 @@
become_method: sudo
become_flags: '-iu {{ redmine_user }}'
tags:
- redmine
- redmine

- name: Reload puma service
systemd:


+ 3
- 3
redmine/tasks/plugins.yml View File

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


+ 3
- 3
redmine/tasks/themes.yml View File

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


+ 1
- 1
tomcat-instance/tasks/user.yml View File

@@ -37,7 +37,7 @@

- name: Run newaliases
command: newaliases
when: tomcat_instance_mail_alias | changed
when: tomcat_instance_mail_alias | changed

- name: Enable sudo right
lineinfile:


+ 1
- 1
webapps/evoadmin-mail/tasks/user.yml View File

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

- name: "Copy conf.php"
template:


+ 3
- 3
webapps/wordpress/tasks/main.yml View File

@@ -28,7 +28,7 @@
changed_when: false

- 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_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') }}"
@@ -44,7 +44,7 @@
- name: Configure Wordpress (wp-config.php)
shell: '{{ wordpress_wpcli }} core config --dbhost={{ db_host }} --dbuser={{ db_user }} --dbpass={{ db_pwd }} --dbname={{ db_name }}'
args:
creates: "{{ ansible_env.HOME }}/www/wp-config.php"
creates: "{{ ansible_env.HOME }}/www/wp-config.php"

- 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'
@@ -90,7 +90,7 @@
Votre nouveau site WordPress a bien été installé à l’adresse :

http://{{ wordpress_host }}
Vous pouvez vous y connecter en tant qu’administrateur avec les informations suivantes :

Identifiant : admin


Loading…
Cancel
Save