From f8517c37b31c082bfa82de32addb8016e58e7b5d Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Sun, 3 Mar 2019 08:07:28 +0100 Subject: [PATCH 1/5] Remove last line in upgrade playbook --- upgrade.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/upgrade.yml b/upgrade.yml index 40b181f..cd4d3c5 100644 --- a/upgrade.yml +++ b/upgrade.yml @@ -9,4 +9,3 @@ upgrade: dist update_cache: yes cache_valid_time: 86400 # one day - From 3892e49971f8eebbc1c0b373d63701a0ccffca76 Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Sun, 3 Mar 2019 08:18:50 +0100 Subject: [PATCH 2/5] Move synapse rest auth url --- matrix.yml | 1 + roles/matrix-synapse/tasks/main.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/matrix.yml b/matrix.yml index 21fb05a..1975e50 100644 --- a/matrix.yml +++ b/matrix.yml @@ -3,6 +3,7 @@ - hosts: synapse.adm.auro.re vars: mxisd_version: 1.3.1 + synapse_rest_auth_url: https://raw.githubusercontent.com/kamax-matrix/matrix-synapse-rest-auth/master/rest_auth_provider.py roles: - debian-backports - matrix-synapse diff --git a/roles/matrix-synapse/tasks/main.yml b/roles/matrix-synapse/tasks/main.yml index 642b723..1ac579f 100644 --- a/roles/matrix-synapse/tasks/main.yml +++ b/roles/matrix-synapse/tasks/main.yml @@ -23,7 +23,7 @@ - name: Install rest auth provider get_url: - url: https://raw.githubusercontent.com/kamax-matrix/matrix-synapse-rest-auth/master/rest_auth_provider.py + url: "{{ synapse_rest_auth_url }}" dest: /usr/local/lib/python3.5/dist-packages/rest_auth_provider.py mode: 0755 notify: Restart matrix-synapse service From b420d31b2f5f36d7a4a8f3096c58713caff6fb04 Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Sun, 3 Mar 2019 08:54:48 +0100 Subject: [PATCH 3/5] Remove last empty line in chsh --- roles/ldap-client/templates/chsh.j2 | 1 - 1 file changed, 1 deletion(-) diff --git a/roles/ldap-client/templates/chsh.j2 b/roles/ldap-client/templates/chsh.j2 index 8302af3..9e6f30f 100644 --- a/roles/ldap-client/templates/chsh.j2 +++ b/roles/ldap-client/templates/chsh.j2 @@ -1,4 +1,3 @@ #!/bin/sh # {{ ansible_managed }} echo "Pour changer votre shell,\nAllez sur l'intranet : {{intranet_url}}" - From ac3d2dee238ae38adf1470aefc7ed7adbe7967ec Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Sun, 3 Mar 2019 09:00:29 +0100 Subject: [PATCH 4/5] Write update_cache true rather than yes --- roles/baseconfig/tasks/apt-listchanges.yml | 2 +- roles/baseconfig/tasks/main.yml | 2 +- roles/baseconfig/tasks/molly-guard.yml | 2 +- roles/codimd/tasks/0_apt_dependencies.yml | 2 +- roles/dokuwiki/tasks/main.yml | 2 +- roles/etherpad/tasks/0_apt_dependencies.yml | 2 +- roles/ldap-client/tasks/0_install_ldap.yml | 4 ++-- roles/ldap-replica/tasks/main.yml | 2 +- roles/matrix-riot/tasks/main.yml | 4 ++-- roles/matrix-synapse/tasks/main.yml | 2 +- roles/nginx-reverse-proxy/tasks/main.yml | 2 +- upgrade.yml | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/roles/baseconfig/tasks/apt-listchanges.yml b/roles/baseconfig/tasks/apt-listchanges.yml index ab37640..56925b2 100644 --- a/roles/baseconfig/tasks/apt-listchanges.yml +++ b/roles/baseconfig/tasks/apt-listchanges.yml @@ -5,7 +5,7 @@ apt: name: apt-listchanges state: present - update_cache: yes + update_cache: true # Send email when there is something new - name: Configure apt-listchanges diff --git a/roles/baseconfig/tasks/main.yml b/roles/baseconfig/tasks/main.yml index 7d6399a..8501e36 100644 --- a/roles/baseconfig/tasks/main.yml +++ b/roles/baseconfig/tasks/main.yml @@ -5,7 +5,7 @@ apt: name: "{{ packages }}" state: present - update_cache: yes + update_cache: true vars: packages: - bash-completion # for bash users diff --git a/roles/baseconfig/tasks/molly-guard.yml b/roles/baseconfig/tasks/molly-guard.yml index e8d19c0..bee8e12 100644 --- a/roles/baseconfig/tasks/molly-guard.yml +++ b/roles/baseconfig/tasks/molly-guard.yml @@ -5,7 +5,7 @@ apt: name: molly-guard state: present - update_cache: yes + update_cache: true # Always ask for hostname - name: Configure molly-guard diff --git a/roles/codimd/tasks/0_apt_dependencies.yml b/roles/codimd/tasks/0_apt_dependencies.yml index f6e30d4..158c59e 100644 --- a/roles/codimd/tasks/0_apt_dependencies.yml +++ b/roles/codimd/tasks/0_apt_dependencies.yml @@ -14,7 +14,7 @@ apt: name: "{{ item }}" state: present - update_cache: yes + update_cache: true with_items: - git - nodejs diff --git a/roles/dokuwiki/tasks/main.yml b/roles/dokuwiki/tasks/main.yml index f6f7e0c..0da632d 100644 --- a/roles/dokuwiki/tasks/main.yml +++ b/roles/dokuwiki/tasks/main.yml @@ -23,4 +23,4 @@ - name: Install DokuWiki apt: name: dokuwiki - update_cache: yes + update_cache: true diff --git a/roles/etherpad/tasks/0_apt_dependencies.yml b/roles/etherpad/tasks/0_apt_dependencies.yml index ca6a348..4c8d341 100644 --- a/roles/etherpad/tasks/0_apt_dependencies.yml +++ b/roles/etherpad/tasks/0_apt_dependencies.yml @@ -14,7 +14,7 @@ apt: name: "{{ item }}" state: present - update_cache: yes + update_cache: true with_items: - build-essential - curl diff --git a/roles/ldap-client/tasks/0_install_ldap.yml b/roles/ldap-client/tasks/0_install_ldap.yml index 45b72ea..79ceb18 100644 --- a/roles/ldap-client/tasks/0_install_ldap.yml +++ b/roles/ldap-client/tasks/0_install_ldap.yml @@ -4,7 +4,7 @@ apt: name: "{{ item }}" state: present - update_cache: yes + update_cache: true with_items: - nslcd - libnss-ldapd @@ -16,7 +16,7 @@ # apt: # name: nscd # state: present -# update_cache: yes +# update_cache: true # Configure /etc/nslcd.conf - name: Configure nslcd LDAP credentials diff --git a/roles/ldap-replica/tasks/main.yml b/roles/ldap-replica/tasks/main.yml index 49ce59a..5face6d 100644 --- a/roles/ldap-replica/tasks/main.yml +++ b/roles/ldap-replica/tasks/main.yml @@ -4,7 +4,7 @@ apt: name: slapd state: present - update_cache: yes + update_cache: true # What is written after is really not a nice way to install a schema # because the LDAP is being flushed away always... diff --git a/roles/matrix-riot/tasks/main.yml b/roles/matrix-riot/tasks/main.yml index 52620ba..007a449 100644 --- a/roles/matrix-riot/tasks/main.yml +++ b/roles/matrix-riot/tasks/main.yml @@ -3,7 +3,7 @@ - name: Install apt-transport-https apt: name: apt-transport-https - update_cache: yes + update_cache: true # Add the repository into source list - name: Configure riot repository @@ -20,7 +20,7 @@ - name: Install riot-web apt: name: riot-web - update_cache: yes + update_cache: true # Install nginx - name: Install nginx diff --git a/roles/matrix-synapse/tasks/main.yml b/roles/matrix-synapse/tasks/main.yml index 1ac579f..06e44bc 100644 --- a/roles/matrix-synapse/tasks/main.yml +++ b/roles/matrix-synapse/tasks/main.yml @@ -2,7 +2,7 @@ - name: Install matrix-synapse apt: name: matrix-synapse - update_cache: yes + update_cache: true default_release: stretch-backports - name: Configure matrix-synapse diff --git a/roles/nginx-reverse-proxy/tasks/main.yml b/roles/nginx-reverse-proxy/tasks/main.yml index 5c7571d..d7a93ee 100644 --- a/roles/nginx-reverse-proxy/tasks/main.yml +++ b/roles/nginx-reverse-proxy/tasks/main.yml @@ -3,7 +3,7 @@ - name: Install NGINX server apt: name: nginx - update_cache: yes + update_cache: true # Install sites - name: Configure NGINX sites diff --git a/upgrade.yml b/upgrade.yml index cd4d3c5..f5fbbef 100644 --- a/upgrade.yml +++ b/upgrade.yml @@ -7,5 +7,5 @@ - name: Upgrade apt: upgrade: dist - update_cache: yes + update_cache: true cache_valid_time: 86400 # one day From eeb2e5a2ae50f4d2b3432f092d5223520d443e34 Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Sun, 3 Mar 2019 09:16:52 +0100 Subject: [PATCH 5/5] Write become true rather than yes --- roles/codimd/handlers/main.yml | 2 +- roles/codimd/tasks/main.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/codimd/handlers/main.yml b/roles/codimd/handlers/main.yml index 49d9031..4dccff2 100644 --- a/roles/codimd/handlers/main.yml +++ b/roles/codimd/handlers/main.yml @@ -4,7 +4,7 @@ command: npm run build args: chdir: /var/local/codimd/codimd - become: yes + become: true become_user: codimd # Reload systemd daemons when a service file changes diff --git a/roles/codimd/tasks/main.yml b/roles/codimd/tasks/main.yml index 6e88490..051248d 100644 --- a/roles/codimd/tasks/main.yml +++ b/roles/codimd/tasks/main.yml @@ -12,7 +12,7 @@ # repo: https://github.com/hackmdio/codimd.git # dest: /var/local/codimd/codimd # version: 1.2.1 -# become: yes +# become: true # become_user: codimd # notify: Build front-end for CodiMD @@ -21,7 +21,7 @@ command: bin/setup args: chdir: /var/local/codimd/codimd - become: yes + become: true become_user: codimd # Connection to database @@ -38,7 +38,7 @@ command: node_modules/.bin/sequelize db:migrate args: chdir: /var/local/codimd/codimd - become: yes + become: true become_user: codimd # Configure