Fix: blank lines and trailing spaces
Signed-off-by: Hadrien Patte <hadrien.patte@protonmail.com>
This commit is contained in:
parent
0d78b9b783
commit
5f08a7522e
46 changed files with 90 additions and 136 deletions
|
@ -47,4 +47,3 @@ d'Ansible.
|
||||||
```
|
```
|
||||||
ansible -i hosts ldap-replica-fleming1.adm.auro.re -m setup --ask-vault-pass
|
ansible -i hosts ldap-replica-fleming1.adm.auro.re -m setup --ask-vault-pass
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
1
base.yml
1
base.yml
|
@ -3,4 +3,3 @@
|
||||||
- hosts: all
|
- hosts: all
|
||||||
roles:
|
roles:
|
||||||
- baseconfig
|
- baseconfig
|
||||||
|
|
||||||
|
|
|
@ -4,4 +4,3 @@
|
||||||
- hosts: horus-wikitest
|
- hosts: horus-wikitest
|
||||||
roles:
|
roles:
|
||||||
- dokuwiki
|
- dokuwiki
|
||||||
|
|
||||||
|
|
|
@ -4,4 +4,3 @@
|
||||||
roles:
|
roles:
|
||||||
- debian-backports
|
- debian-backports
|
||||||
- etherpad
|
- etherpad
|
||||||
|
|
||||||
|
|
|
@ -30,4 +30,3 @@ ssh_pub_keys: "{{ vault_ssh_pub_keys }}"
|
||||||
|
|
||||||
# Monitoring
|
# Monitoring
|
||||||
monitoring_mail: 'monitoring.aurore@lists.crans.org'
|
monitoring_mail: 'monitoring.aurore@lists.crans.org'
|
||||||
|
|
||||||
|
|
|
@ -2,4 +2,3 @@
|
||||||
ldap_local_replica_uri:
|
ldap_local_replica_uri:
|
||||||
- 'ldap://ldap-replica-fleming1.adm.auro.re'
|
- 'ldap://ldap-replica-fleming1.adm.auro.re'
|
||||||
- 'ldap://ldap-replica-fleming2.adm.auro.re'
|
- 'ldap://ldap-replica-fleming2.adm.auro.re'
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
---
|
---
|
||||||
ldap_local_replica_uri:
|
ldap_local_replica_uri:
|
||||||
- 'ldap://10.128.0.100'
|
- 'ldap://10.128.0.100'
|
||||||
|
|
||||||
|
|
1
hosts
1
hosts
|
@ -61,4 +61,3 @@ fleming-pve
|
||||||
# every LDAP replica
|
# every LDAP replica
|
||||||
[ldap-replica:children]
|
[ldap-replica:children]
|
||||||
fleming-vm-ldap-replica
|
fleming-vm-ldap-replica
|
||||||
|
|
||||||
|
|
1
ldap.yml
1
ldap.yml
|
@ -9,4 +9,3 @@
|
||||||
#- hosts: ldap-replica
|
#- hosts: ldap-replica
|
||||||
# roles:
|
# roles:
|
||||||
# - ldap-replica
|
# - ldap-replica
|
||||||
|
|
||||||
|
|
|
@ -12,4 +12,3 @@
|
||||||
- hosts: riot.adm.auro.re
|
- hosts: riot.adm.auro.re
|
||||||
roles:
|
roles:
|
||||||
- matrix-riot
|
- matrix-riot
|
||||||
|
|
||||||
|
|
|
@ -35,4 +35,3 @@
|
||||||
to: codimd.adm.auro.re:8080
|
to: codimd.adm.auro.re:8080
|
||||||
roles:
|
roles:
|
||||||
- nginx-reverse-proxy
|
- nginx-reverse-proxy
|
||||||
|
|
||||||
|
|
|
@ -17,4 +17,3 @@
|
||||||
confirm: 'confirm=true'
|
confirm: 'confirm=true'
|
||||||
email_address: "email_address={{ monitoring_mail }}"
|
email_address: "email_address={{ monitoring_mail }}"
|
||||||
which: 'which=both'
|
which: 'which=both'
|
||||||
|
|
||||||
|
|
|
@ -55,4 +55,3 @@
|
||||||
with_dict:
|
with_dict:
|
||||||
dot_zshrc: .zshrc
|
dot_zshrc: .zshrc
|
||||||
dot_zshrc.local: .zshrc.local
|
dot_zshrc.local: .zshrc.local
|
||||||
|
|
||||||
|
|
|
@ -13,4 +13,3 @@
|
||||||
dest: /etc/molly-guard/rc
|
dest: /etc/molly-guard/rc
|
||||||
regexp: '^#*\s*ALWAYS_QUERY_HOSTNAME.*$'
|
regexp: '^#*\s*ALWAYS_QUERY_HOSTNAME.*$'
|
||||||
line: 'ALWAYS_QUERY_HOSTNAME=true'
|
line: 'ALWAYS_QUERY_HOSTNAME=true'
|
||||||
|
|
||||||
|
|
|
@ -28,4 +28,3 @@ deb {{ debian_security_mirror }} {{ ansible_distribution_release }}/updates {{ d
|
||||||
# Backports
|
# Backports
|
||||||
deb {{ debian_security_mirror }} {{ ansible_distribution_release }}-backports {{ debian_components }}
|
deb {{ debian_security_mirror }} {{ ansible_distribution_release }}-backports {{ debian_components }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
|
|
@ -10,4 +10,3 @@
|
||||||
# Reload systemd daemons when a service file changes
|
# Reload systemd daemons when a service file changes
|
||||||
- name: Reload systemd daemons
|
- name: Reload systemd daemons
|
||||||
command: systemctl daemon-reload
|
command: systemctl daemon-reload
|
||||||
|
|
||||||
|
|
|
@ -66,4 +66,3 @@
|
||||||
name: codimd
|
name: codimd
|
||||||
state: started
|
state: started
|
||||||
enabled: true
|
enabled: true
|
||||||
|
|
||||||
|
|
|
@ -3,4 +3,3 @@
|
||||||
Package: node* libuv1*
|
Package: node* libuv1*
|
||||||
Pin: release a=stretch-backports
|
Pin: release a=stretch-backports
|
||||||
Pin-Priority: 600
|
Pin-Priority: 600
|
||||||
|
|
||||||
|
|
|
@ -16,4 +16,3 @@ Restart=always
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=multi-user.target
|
WantedBy=multi-user.target
|
||||||
|
|
||||||
|
|
|
@ -5,4 +5,3 @@
|
||||||
src: backports.list.j2
|
src: backports.list.j2
|
||||||
dest: /etc/apt/sources.list.d/backports.list
|
dest: /etc/apt/sources.list.d/backports.list
|
||||||
mode: 0644
|
mode: 0644
|
||||||
|
|
||||||
|
|
|
@ -6,4 +6,3 @@
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
deb {{ debian_mirror }} {{ ansible_distribution_release }}-backports main
|
deb {{ debian_mirror }} {{ ansible_distribution_release }}-backports main
|
||||||
|
|
||||||
|
|
|
@ -20,4 +20,3 @@
|
||||||
apt:
|
apt:
|
||||||
name: dokuwiki
|
name: dokuwiki
|
||||||
update_cache: yes
|
update_cache: yes
|
||||||
|
|
||||||
|
|
|
@ -7,4 +7,3 @@
|
||||||
|
|
||||||
deb {{ debian_mirror }} buster main
|
deb {{ debian_mirror }} buster main
|
||||||
deb-src {{ debian_mirror }} buster main
|
deb-src {{ debian_mirror }} buster main
|
||||||
|
|
||||||
|
|
|
@ -7,4 +7,3 @@ Pin-Priority: 990
|
||||||
Package: dokuwiki
|
Package: dokuwiki
|
||||||
Pin: release n=buster
|
Pin: release n=buster
|
||||||
Pin-Priority: 990
|
Pin-Priority: 990
|
||||||
|
|
||||||
|
|
|
@ -2,4 +2,3 @@
|
||||||
# Reload systemd daemons when a service file changes
|
# Reload systemd daemons when a service file changes
|
||||||
- name: Reload systemd daemons
|
- name: Reload systemd daemons
|
||||||
command: systemctl daemon-reload
|
command: systemctl daemon-reload
|
||||||
|
|
||||||
|
|
|
@ -19,4 +19,3 @@
|
||||||
- git
|
- git
|
||||||
- nodejs
|
- nodejs
|
||||||
- npm
|
- npm
|
||||||
|
|
||||||
|
|
|
@ -24,4 +24,3 @@
|
||||||
owner: etherpad
|
owner: etherpad
|
||||||
group: etherpad
|
group: etherpad
|
||||||
mode: 0750
|
mode: 0750
|
||||||
|
|
||||||
|
|
|
@ -57,4 +57,3 @@
|
||||||
# TODO-list
|
# TODO-list
|
||||||
# * Configure admin user, logs
|
# * Configure admin user, logs
|
||||||
# Plugins : https://framacloud.org/fr/cultiver-son-jardin/etherpad.html#concernant-framapad
|
# Plugins : https://framacloud.org/fr/cultiver-son-jardin/etherpad.html#concernant-framapad
|
||||||
|
|
||||||
|
|
|
@ -3,4 +3,3 @@
|
||||||
Package: node* libuv1*
|
Package: node* libuv1*
|
||||||
Pin: release a=stretch-backports
|
Pin: release a=stretch-backports
|
||||||
Pin-Priority: 600
|
Pin-Priority: 600
|
||||||
|
|
||||||
|
|
|
@ -15,4 +15,3 @@ Restart=always
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=multi-user.target
|
WantedBy=multi-user.target
|
||||||
|
|
||||||
|
|
|
@ -14,4 +14,3 @@
|
||||||
state: restarted
|
state: restarted
|
||||||
ignore_errors: true # Sometimes service do not exist
|
ignore_errors: true # Sometimes service do not exist
|
||||||
listen: Restart nslcd service
|
listen: Restart nslcd service
|
||||||
|
|
||||||
|
|
|
@ -38,4 +38,3 @@
|
||||||
shadow: 'shadow: files ldap'
|
shadow: 'shadow: files ldap'
|
||||||
sudoers: 'sudoers: files ldap'
|
sudoers: 'sudoers: files ldap'
|
||||||
notify: Restart nslcd service
|
notify: Restart nslcd service
|
||||||
|
|
||||||
|
|
|
@ -18,4 +18,3 @@
|
||||||
dest: /etc/sudoers
|
dest: /etc/sudoers
|
||||||
regexp: "^%{{ sudo_group }}"
|
regexp: "^%{{ sudo_group }}"
|
||||||
line: "%{{ sudo_group }} ALL=(ALL:ALL) ALL"
|
line: "%{{ sudo_group }} ALL=(ALL:ALL) ALL"
|
||||||
|
|
||||||
|
|
|
@ -15,4 +15,3 @@
|
||||||
src: /usr/local/bin/chsh
|
src: /usr/local/bin/chsh
|
||||||
dest: /usr/local/bin/chsh.ldap
|
dest: /usr/local/bin/chsh.ldap
|
||||||
state: link
|
state: link
|
||||||
|
|
||||||
|
|
|
@ -22,4 +22,3 @@
|
||||||
key: "{{ ssh_pub_keys }}"
|
key: "{{ ssh_pub_keys }}"
|
||||||
state: present
|
state: present
|
||||||
# exclusive: True
|
# exclusive: True
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# {{ ansible_managed }}
|
# {{ ansible_managed }}
|
||||||
echo "Pour changer votre mot de passe,\nAllez sur l'intranet : {{intranet_url}}"
|
echo "Pour changer votre mot de passe,\nAllez sur l'intranet : {{intranet_url}}"
|
||||||
|
|
||||||
|
|
|
@ -56,4 +56,3 @@
|
||||||
# Save the day
|
# Save the day
|
||||||
- name: Start LDAP server
|
- name: Start LDAP server
|
||||||
service: name=slapd state=started
|
service: name=slapd state=started
|
||||||
|
|
||||||
|
|
|
@ -1183,4 +1183,3 @@ createTimestamp: 20150305013830Z
|
||||||
entryCSN: 20160607103125.521039Z#000000#000#000000
|
entryCSN: 20160607103125.521039Z#000000#000#000000
|
||||||
modifiersName: cn=config
|
modifiersName: cn=config
|
||||||
modifyTimestamp: 20160607103125Z
|
modifyTimestamp: 20160607103125Z
|
||||||
|
|
||||||
|
|
|
@ -4,4 +4,3 @@
|
||||||
service:
|
service:
|
||||||
name: mxisd
|
name: mxisd
|
||||||
state: restarted
|
state: restarted
|
||||||
|
|
||||||
|
|
|
@ -87,4 +87,3 @@ threepid:
|
||||||
|
|
||||||
# Password for the account
|
# Password for the account
|
||||||
password: ""
|
password: ""
|
||||||
|
|
||||||
|
|
|
@ -49,4 +49,3 @@
|
||||||
dest: /etc/nginx/sites-enabled/riot
|
dest: /etc/nginx/sites-enabled/riot
|
||||||
state: link
|
state: link
|
||||||
notify: Reload NGINX service
|
notify: Reload NGINX service
|
||||||
|
|
||||||
|
|
|
@ -4,4 +4,3 @@
|
||||||
service:
|
service:
|
||||||
name: matrix-synapse
|
name: matrix-synapse
|
||||||
state: restarted
|
state: restarted
|
||||||
|
|
||||||
|
|
|
@ -15,4 +15,3 @@ listeners:
|
||||||
compress: true
|
compress: true
|
||||||
- names: [federation]
|
- names: [federation]
|
||||||
compress: false
|
compress: false
|
||||||
|
|
||||||
|
|
|
@ -4,4 +4,3 @@
|
||||||
service:
|
service:
|
||||||
name: nginx
|
name: nginx
|
||||||
state: reloaded
|
state: reloaded
|
||||||
|
|
||||||
|
|
|
@ -29,4 +29,3 @@
|
||||||
state: link
|
state: link
|
||||||
loop: "{{ reversed_proxy_subdomains }}"
|
loop: "{{ reversed_proxy_subdomains }}"
|
||||||
notify: Reload NGINX service
|
notify: Reload NGINX service
|
||||||
|
|
||||||
|
|
|
@ -33,4 +33,3 @@ server {
|
||||||
add_header X-Clacks-Overhead "GNU Terry Pratchett";
|
add_header X-Clacks-Overhead "GNU Terry Pratchett";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue