Replace include by include_tasks/import_tasks

osm-fr · Dec 29, 2023 · 204e027 · 204e027
1 parent 1575396
commit 204e027
Show file tree

Hide file tree

Showing 20 changed files with 74 additions and 29 deletions.
diff --git a/roles/comcommaker/tasks/main.yml b/roles/comcommaker/tasks/main.yml
@@ -11,7 +11,7 @@
       - libapache2-mod-wsgi-py3
 
 
-- include: ../../../shared/project-account.yml
+- include_tasks: ../../../shared/project-account.yml
   vars:
     user: "{{ comcommaker_user }}"
 

diff --git a/roles/drupal/tasks/main.yml b/roles/drupal/tasks/main.yml
@@ -9,7 +9,9 @@
     - postgresql-9.4
     - python-psycopg2
 
-- include: ../../../shared/project-account.yml user=www
+- include_tasks: ../../../shared/project-account.yml
+  vars:
+    user: www
 
 - name: init database
   postgresql_db: name=osm_fr encoding='UTF-8' lc_collate='en_US.UTF-8' lc_ctype='en_US.UTF-8' template='template0'

diff --git a/roles/export-cadastre/tasks/main.yml b/roles/export-cadastre/tasks/main.yml
@@ -26,7 +26,9 @@
       - zlib1g-dev
       - libjpeg-dev
 
-- include: ../../../shared/project-account.yml user=cadastre
+- include_tasks: ../../../shared/project-account.yml
+  vars:
+    user: cadastre
 
 - name: add cadastre user to www-data group
   user: name="cadastre" groups="www-data" append=yes

diff --git a/roles/geoosm/tasks/main.yml b/roles/geoosm/tasks/main.yml
@@ -33,7 +33,9 @@
 - name: ensure postgresql server is running
   service: name=postgresql state=started
 
-- include: ../../../shared/project-account.yml user=geoosm
+- include_tasks: ../../../shared/project-account.yml
+  vars:
+    user: geoosm
 
 - name: checkout git repository for backend
   git:

diff --git a/roles/layers.openstreetmap.fr/tasks/main.yml b/roles/layers.openstreetmap.fr/tasks/main.yml
@@ -1,4 +1,7 @@
-- include: ../../../shared/project-account.yml user=layers.openstreetmap.fr
+- include_tasks: ../../../shared/project-account.yml
+  vars:
+    user: layers.openstreetmap.fr
+
 - name: install packages
   apt: pkg={{ item }}
   with_items:

diff --git a/roles/letsencrypt/tasks/acme-tiny.yml b/roles/letsencrypt/tasks/acme-tiny.yml
@@ -1,4 +1,7 @@
-- include: ../../../shared/project-account.yml user=letsencrypt generate_ssh_key=yes
+- include_tasks: ../../../shared/project-account.yml
+  vars:
+    user: letsencrypt
+    generate_ssh_key: yes
 
 - name: fetch generated public ssh key
   fetch: src=/data/project/letsencrypt/.ssh/id_rsa.pub dest=public_keys/letsencrypt-{{ inventory_hostname }} flat=yes

diff --git a/roles/letsencrypt/tasks/certbot.yml b/roles/letsencrypt/tasks/certbot.yml
@@ -1,4 +1,7 @@
-- include: ../../../shared/project-account.yml user=letsencrypt generate_ssh_key=yes
+- include_tasks: ../../../shared/project-account.yml
+  vars:
+    user: letsencrypt
+    generate_ssh_key: yes
 
 - name: fetch generated public ssh key
   fetch: src=/data/project/letsencrypt/.ssh/id_rsa.pub dest=public_keys/letsencrypt-{{ inventory_hostname }} flat=yes

diff --git a/roles/letsencrypt/tasks/main.yml b/roles/letsencrypt/tasks/main.yml
@@ -1,7 +1,7 @@
 - name: run acme-tiny
-  include: acme-tiny.yml
+  include_tasks: acme-tiny.yml
   when: letsencrypt_certbot is not defined
 
 - name: run certbot
-  include: certbot.yml
+  include_tasks: certbot.yml
   when: letsencrypt_certbot is defined
diff --git a/roles/live/tasks/main.yml b/roles/live/tasks/main.yml
@@ -6,7 +6,9 @@
     - python3-iso8601
     - sqlite3
 
-- include: ../../../shared/project-account.yml user=live
+- include_tasks: ../../../shared/project-account.yml
+  vars:
+    user: live
 
 - name: add sudoers to access live user
   copy: src=sudoers dest=/etc/sudoers.d/live mode=0440 owner=root group=root validate='visudo -cf %s'

diff --git a/roles/nextcloud/tasks/main.yml b/roles/nextcloud/tasks/main.yml
@@ -19,7 +19,9 @@
     - php-xml
     - php-zip
 
-- include: ../../../shared/project-account.yml user=nextcloud
+- include_tasks: ../../../shared/project-account.yml
+  vars:
+    user: nextcloud
 
 
 # install phpBB3 manually in /data/project/nextcloud/nextcloud/

diff --git a/roles/osmbin/tasks/main.yml b/roles/osmbin/tasks/main.yml
@@ -37,7 +37,9 @@
   with_items:
     - osmium-2.15.2-or-later_1.0_all.deb
 
-- include: ../../../shared/project-account.yml user=osmbin
+- include_tasks: ../../../shared/project-account.yml
+  vars:
+    user: osmbin
 
 - name: add sudoers to access osmbin user
   copy: src=sudoers dest=/etc/sudoers.d/osmbin mode=0440 owner=root group=root validate='visudo -cf %s'

diff --git a/roles/osmose-frontend/tasks/main.yml b/roles/osmose-frontend/tasks/main.yml
@@ -29,7 +29,9 @@
 - name: ensure postgresql server is running
   service: name=postgresql state=started
 
-- include: ../../../shared/project-account.yml user=osmose
+- include_tasks: ../../../shared/project-account.yml
+  vars:
+    user: osmose
 
 - name: init /data/work/osmose/results/
   file: path=/data/work/osmose/results/ state=directory owner=osmose group=osmose

diff --git a/roles/osmosis/tasks/main.yml b/roles/osmosis/tasks/main.yml
@@ -23,7 +23,9 @@
 - name: ensure postgresql server is running
   service: name=postgresql state=started
 
-- include: ../../../shared/project-account.yml user=osmosis
+- include_tasks: ../../../shared/project-account.yml
+  vars:
+    user: osmosis
 
 - name: add sudoers to access osmosis user
   copy: src=sudoers dest=/etc/sudoers.d/osmosis-backend mode=0440 owner=root group=root validate='visudo -cf %s'
@@ -97,7 +99,10 @@
   become: yes
   become_user: osmosis
 
-- include: ../../../shared/osmosis.yml user=osmosis version=0.47
+- include_tasks: ../../../shared/osmosis.yml
+  vars:
+    user: osmosis
+    version: 0.47
 
 # To finish installation, run:
 # - (cd /data/work/osmosis/ && wget http://download.openstreetmap.fr/extracts/europe/france.osm.pbf)

diff --git a/roles/overpass-api/tasks/main.yml b/roles/overpass-api/tasks/main.yml
@@ -4,7 +4,10 @@
       - "ansible_version.full | version_compare('2.3', '>=')"
     msg: "ansible version must be >= 2.3, please update ansible."
 
-- include: ../../../shared/project-account.yml user="{{ overpass_user }}" user_system="yes"
+- include_tasks: ../../../shared/project-account.yml
+  vars:
+    user: "{{ overpass_user }}"
+    user_system: "yes"
 
 
 - name: set overpass_database_dir
@@ -25,9 +28,9 @@
     - "{{ overpass_database_dir }}"
     - "{{ overpass_webroot_dir }}"
 
-- include: compile.yml
-- include: set_up_database.yml
-- include: services.yml
-- include: web.yml
-- include: munin.yml
-- include: restart.yml
+- import_tasks: compile.yml
+- import_tasks: set_up_database.yml
+- import_tasks: services.yml
+- import_tasks: web.yml
+- import_tasks: munin.yml
+- import_tasks: restart.yml
diff --git a/roles/polygons/tasks/main.yml b/roles/polygons/tasks/main.yml
@@ -25,7 +25,9 @@
 - name: ensure postgresql server is running
   service: name=postgresql state=started
 
-- include: ../../../shared/project-account.yml user=polygons
+- include_tasks: ../../../shared/project-account.yml
+  vars:
+    user: polygons
 
 - name: add sudoers to access polygons user
   copy: src=sudoers dest=/etc/sudoers.d/polygons mode=0440 owner=root group=root validate='visudo -cf %s'

diff --git a/roles/rawedit/tasks/main.yml b/roles/rawedit/tasks/main.yml
@@ -23,7 +23,9 @@
 - name: ensure postgresql server is running
   service: name=postgresql state=started
 
-- include: ../../../shared/project-account.yml user=rawedit
+- include_tasks: ../../../shared/project-account.yml
+  vars:
+    user: rawedit
 
 
 - name: init database

diff --git a/roles/renderd/tasks/cyclosm.yml b/roles/renderd/tasks/cyclosm.yml
@@ -1,5 +1,7 @@
 # style cyclosm
-- include: ../../../shared/project-account.yml user=cyclosm
+- include_tasks: ../../../shared/project-account.yml
+  vars:
+    user: cyclosm
 
 - name: checkout git repository
   git:

diff --git a/roles/renderd/tasks/main.yml b/roles/renderd/tasks/main.yml
@@ -42,7 +42,9 @@
       - libapache2-mod-tile
 
 # style OSM-FR style
-- include: ../../../shared/project-account.yml user=osmfr-cartocss
+- include_tasks: ../../../shared/project-account.yml
+  vars:
+    user: osmfr-cartocss
   when: renderd_osmfr
 
 - name: checkout git repository
@@ -53,7 +55,9 @@
 
 # style layers
 # TODO: recompilation de renderd avec XMLCONFIGS_MAX=64
-- include: ../../../shared/project-account.yml user=layers
+- include_tasks: ../../../shared/project-account.yml
+  vars:
+    user: layers
   when: renderd_layers
 
 - name: checkout git repository

diff --git a/roles/taginfo/tasks/main.yml b/roles/taginfo/tasks/main.yml
@@ -29,7 +29,9 @@
     - osmctools
 
 
-- include: ../../../shared/project-account.yml user=taginfo
+- include_tasks: ../../../shared/project-account.yml
+  vars:
+    user: taginfo
 
 - name: init /data/work/taginfo paths
   file: path={{ item }} state=directory owner=taginfo group=taginfo

diff --git a/roles/yeswiki/tasks/main.yml b/roles/yeswiki/tasks/main.yml
@@ -11,7 +11,9 @@
     - php7.0-zip
     - python-pymysql
 
-- include: ../../../shared/project-account.yml user=yeswiki
+- include_tasks: ../../../shared/project-account.yml
+  vars:
+    user: yeswiki
 
 
 # install yeswiki manually in /data/project/yeswiki/yeswiki/