Refactor: include: ==> import_tasks:
This commit is contained in:
parent
35a3336f2d
commit
bd69071947
|
@ -1,4 +1,4 @@
|
|||
---
|
||||
- include: ansible-packages.yml
|
||||
- include: ansible-config.yml
|
||||
- import_tasks: ansible-packages.yml
|
||||
- import_tasks: ansible-config.yml
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
---
|
||||
- include: apache-ppa.yml
|
||||
- include: apache.yml
|
||||
- include: apache-modules.yml
|
||||
- include: apache-basic-auth.yml
|
||||
- import_tasks: apache-ppa.yml
|
||||
- import_tasks: apache.yml
|
||||
- import_tasks: apache-modules.yml
|
||||
- import_tasks: apache-basic-auth.yml
|
||||
when: apache_basic_auth
|
||||
- include: apache-letsencrypt.yml
|
||||
- import_tasks: apache-letsencrypt.yml
|
||||
when: letsencrypt_acme_install is defined and letsencrypt_acme_install
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
---
|
||||
- include: couchbase.yml
|
||||
- include: swappiness.yml
|
||||
- include: ganglia-plugin.yml
|
||||
- import_tasks: couchbase.yml
|
||||
- import_tasks: swappiness.yml
|
||||
- import_tasks: ganglia-plugin.yml
|
||||
when: ganglia_enabled
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
---
|
||||
- include: couchdb-1.yml
|
||||
- import_tasks: couchdb-1.yml
|
||||
when: couchdb_use_old_package
|
||||
- include: couchdb-2.yml
|
||||
- import_tasks: couchdb-2.yml
|
||||
when: not couchdb_use_old_package
|
||||
- include: ganglia-plugin.yml
|
||||
- import_tasks: ganglia-plugin.yml
|
||||
when: ganglia_enabled
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
---
|
||||
- include: dnet-groups.yml
|
||||
- include: sudo-config.yml
|
||||
- include: dnet-other-services-users.yml
|
||||
- import_tasks: dnet-groups.yml
|
||||
- import_tasks: sudo-config.yml
|
||||
- import_tasks: dnet-other-services-users.yml
|
||||
when: dnet_other_services_users is defined
|
||||
- include: dnet-data-dirs.yml
|
||||
- import_tasks: dnet-data-dirs.yml
|
||||
when: dnet_standard_installation
|
||||
- include: dnet-users-data-dirs.yml
|
||||
- import_tasks: dnet-users-data-dirs.yml
|
||||
when: dnet_users_data_directories is defined
|
||||
- include: dnet-additional-packages.yml
|
||||
- include: dnet-tomcat-acls.yml
|
||||
- import_tasks: dnet-additional-packages.yml
|
||||
- import_tasks: dnet-tomcat-acls.yml
|
||||
when: dnet_standard_installation
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
---
|
||||
- include: pkgs.yml
|
||||
- import_tasks: pkgs.yml
|
||||
|
||||
- name: Enable Docker TCP on local bridge (for docker swarm)
|
||||
action: configfile path=/etc/default/docker syntax=shell key=DOCKER_OPTS value="\"-H tcp://172.17.42.1:2375 -H unix:///var/run/docker.sock\""
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
---
|
||||
- include: drupal-main.yml
|
||||
- import_tasks: drupal-main.yml
|
||||
when: drupal_install
|
||||
- include: drupal-utility.yml
|
||||
- include: drush.yml
|
||||
- import_tasks: drupal-utility.yml
|
||||
- import_tasks: drush.yml
|
||||
when: drupal_install_drush
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
---
|
||||
- include: fail2ban.yml
|
||||
- import_tasks: fail2ban.yml
|
||||
when: has_fail2ban
|
||||
- include: fail2ban-rules.yml
|
||||
- import_tasks: fail2ban-rules.yml
|
||||
when: has_fail2ban
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
---
|
||||
- include: foreman-packages.yml
|
||||
- import_tasks: foreman-packages.yml
|
||||
|
||||
|
|
|
@ -1,18 +1,18 @@
|
|||
---
|
||||
- include: haproxy-service.yml
|
||||
- include: haproxy-letsencrypt.yml
|
||||
- import_tasks: haproxy-service.yml
|
||||
- import_tasks: haproxy-letsencrypt.yml
|
||||
when:
|
||||
- haproxy_letsencrypt_managed
|
||||
- letsencrypt_install is defined
|
||||
- include: haproxy-letsencrypt-acmetool.yml
|
||||
- import_tasks: haproxy-letsencrypt-acmetool.yml
|
||||
when:
|
||||
- haproxy_letsencrypt_managed
|
||||
- letsencrypt_acme_install is defined
|
||||
- include: haproxy-ssl.yml
|
||||
- import_tasks: haproxy-ssl.yml
|
||||
when:
|
||||
- haproxy_letsencrypt_managed
|
||||
|
||||
- include: haproxy-nagios.yml
|
||||
- import_tasks: haproxy-nagios.yml
|
||||
when:
|
||||
- nagios_enabled is defined
|
||||
- nagios_enabled
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
---
|
||||
- include: apache.yml
|
||||
- include: jetty.yml
|
||||
- import_tasks: apache.yml
|
||||
- import_tasks: jetty.yml
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
---
|
||||
- include: jetty.yml
|
||||
- import_tasks: jetty.yml
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
---
|
||||
- include: mongodb.yml
|
||||
- include: ganglia-plugin.yml
|
||||
- import_tasks: mongodb.yml
|
||||
- import_tasks: ganglia-plugin.yml
|
||||
when: ganglia_enabled
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
---
|
||||
- include: mongodb.yml
|
||||
- include: ganglia-plugin.yml
|
||||
- import_tasks: mongodb.yml
|
||||
- import_tasks: ganglia-plugin.yml
|
||||
when: ganglia_enabled
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
---
|
||||
- include: packages.yml
|
||||
- include: mysql-conf.yml
|
||||
- import_tasks: packages.yml
|
||||
- import_tasks: mysql-conf.yml
|
||||
when: mysql_enabled
|
||||
- include: manage-mysql-service.yml
|
||||
- include: configure_root_access.yml
|
||||
- import_tasks: manage-mysql-service.yml
|
||||
- import_tasks: configure_root_access.yml
|
||||
when: mysql_enabled
|
||||
- include: manage_my_db.yml
|
||||
- import_tasks: manage_my_db.yml
|
||||
when: mysql_enabled
|
||||
- include: mysql-backup.yml
|
||||
- import_tasks: mysql-backup.yml
|
||||
when: mysql_enabled
|
||||
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
---
|
||||
- include: nginx.yml
|
||||
- include: nginx-config.yml
|
||||
- include: nginx-virtualhosts.yml
|
||||
- import_tasks: nginx.yml
|
||||
- import_tasks: nginx-config.yml
|
||||
- import_tasks: nginx-virtualhosts.yml
|
||||
when: nginx_use_common_virthost
|
||||
- include: nginx-letsencrypt.yml
|
||||
- import_tasks: nginx-letsencrypt.yml
|
||||
when: letsencrypt_acme_install is defined and letsencrypt_acme_install
|
||||
- include: basic-auth.yml
|
||||
- include: pam-ldap.yml
|
||||
- import_tasks: basic-auth.yml
|
||||
- import_tasks: pam-ldap.yml
|
||||
|
||||
- name: Ensure that the webserver is running and enabled at boot time
|
||||
service: name=nginx state=started enabled=yes
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
---
|
||||
- include: openvpn.yml
|
||||
- include: letsencrypt-openvpn.yml
|
||||
- import_tasks: openvpn.yml
|
||||
- import_tasks: letsencrypt-openvpn.yml
|
||||
when: openvpn_letsencrypt_managed
|
||||
|
|
|
@ -1,39 +1,39 @@
|
|||
---
|
||||
- include: postgresql_org_repo.yml
|
||||
- import_tasks: postgresql_org_repo.yml
|
||||
when: pg_use_postgresql_org_repo
|
||||
- include: packages.yml
|
||||
- import_tasks: packages.yml
|
||||
when: psql_postgresql_install
|
||||
- include: postgis.yml
|
||||
- import_tasks: postgis.yml
|
||||
when: postgres_install_gis_extensions
|
||||
- include: postgresql-config.yml
|
||||
- import_tasks: postgresql-config.yml
|
||||
when: psql_postgresql_install
|
||||
- include: postgresql-ssl-config.yml
|
||||
- import_tasks: postgresql-ssl-config.yml
|
||||
when: psql_postgresql_install
|
||||
- include: psql-kernel-sharedmem.yml
|
||||
- import_tasks: psql-kernel-sharedmem.yml
|
||||
when:
|
||||
- psql_postgresql_install
|
||||
- psql_set_shared_memory
|
||||
- include: configure-access.yml
|
||||
- import_tasks: configure-access.yml
|
||||
when:
|
||||
- psql_postgresql_install
|
||||
- psql_db_data is defined
|
||||
- include: postgresql-service-status.yml
|
||||
- import_tasks: postgresql-service-status.yml
|
||||
when: psql_postgresql_install
|
||||
- include: postgres_pgpool.yml
|
||||
- import_tasks: postgres_pgpool.yml
|
||||
when: psql_pgpool_install
|
||||
- include: manage_pg_db.yml
|
||||
- import_tasks: manage_pg_db.yml
|
||||
when:
|
||||
- psql_postgresql_install
|
||||
- psql_db_data is defined
|
||||
- include: postgresql-backup.yml
|
||||
- import_tasks: postgresql-backup.yml
|
||||
when:
|
||||
- psql_postgresql_install
|
||||
- include: pgpool-ii.yml
|
||||
- import_tasks: pgpool-ii.yml
|
||||
when: psql_pgpool_service_install
|
||||
- include: postgresql-letsencrypt-acmetool.yml
|
||||
- import_tasks: postgresql-letsencrypt-acmetool.yml
|
||||
when:
|
||||
- letsencrypt_acme_install is defined
|
||||
- include: pgpool-letsencrypt-acmetool.yml
|
||||
- import_tasks: pgpool-letsencrypt-acmetool.yml
|
||||
when:
|
||||
- letsencrypt_acme_install is defined
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
---
|
||||
- include: base-packages-old-gems.yml
|
||||
- import_tasks: base-packages-old-gems.yml
|
||||
when: is_precise
|
||||
- include: base-packages.yml
|
||||
- import_tasks: base-packages.yml
|
||||
when: is_trusty
|
||||
- include: rubygems.yml
|
||||
- include: redmine.yml
|
||||
- include: redmine-plugins.yml
|
||||
- include: base-config.yml
|
||||
- include: mod_passenger.yml
|
||||
- import_tasks: rubygems.yml
|
||||
- import_tasks: redmine.yml
|
||||
- import_tasks: redmine-plugins.yml
|
||||
- import_tasks: base-config.yml
|
||||
- import_tasks: mod_passenger.yml
|
||||
when: ruby_use_mod_passenger
|
||||
- include: unicorn.yml
|
||||
- import_tasks: unicorn.yml
|
||||
when: ruby_use_unicorn
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
---
|
||||
- include: setup-egi-image.yml
|
||||
- import_tasks: setup-egi-image.yml
|
||||
when: egi_image
|
||||
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
---
|
||||
- include: root-ssh-keys.yml
|
||||
- import_tasks: root-ssh-keys.yml
|
||||
when:
|
||||
- user_ssh_key is defined
|
||||
- manage_root_ssh_keys
|
||||
- include: non-root-ssh-keys.yml
|
||||
- import_tasks: non-root-ssh-keys.yml
|
||||
when: non_root_users
|
||||
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
---
|
||||
- include: packages.yml
|
||||
- include: java-requirements.yml
|
||||
- import_tasks: packages.yml
|
||||
- import_tasks: java-requirements.yml
|
||||
|
|
Loading…
Reference in New Issue