You've already forked ansible-directadmin
Optimize syntax
This commit is contained in:
@@ -6,7 +6,7 @@
|
||||
cache_valid_time: "{{ directadmin_cache_timeout }}"
|
||||
state: present
|
||||
with_items:
|
||||
- "{{ directadmin_debian6_packages }}"
|
||||
- "{{ directadmin_debian6_packages }}"
|
||||
when: "ansible_distribution == 'Debian' and ansible_distribution_release == 'squeeze'"
|
||||
|
||||
- name: Install dependencies for Debian 7 Wheezy
|
||||
@@ -16,7 +16,7 @@
|
||||
cache_valid_time: "{{ directadmin_cache_timeout }}"
|
||||
state: present
|
||||
with_items:
|
||||
- "{{ directadmin_debian7_packages }}"
|
||||
- "{{ directadmin_debian7_packages }}"
|
||||
when: "ansible_distribution == 'Debian' and ansible_distribution_release == 'wheezy'"
|
||||
|
||||
- name: Install dependencies for Debian 8 Jessie
|
||||
@@ -26,5 +26,5 @@
|
||||
cache_valid_time: "{{ directadmin_cache_timeout }}"
|
||||
state: present
|
||||
with_items:
|
||||
- "{{ directadmin_debian8_packages }}"
|
||||
- "{{ directadmin_debian8_packages }}"
|
||||
when: "ansible_distribution == 'Debian' and ansible_distribution_release == 'jessie'"
|
||||
|
||||
@@ -5,22 +5,22 @@
|
||||
update_cache: yes
|
||||
state: present
|
||||
with_items:
|
||||
- "{{ directadmin_rhel_packages_generic }}"
|
||||
- "{{ directadmin_rhel_packages_generic }}"
|
||||
|
||||
- name: install everywhere but on CentOS7
|
||||
yum:
|
||||
yum:
|
||||
name: "{{ item }}"
|
||||
update_cache: yes
|
||||
state: present
|
||||
with_items:
|
||||
- "{{ directadmin_rhel_packages }}"
|
||||
- "{{ directadmin_rhel_packages }}"
|
||||
when: ansible_distribution not 'CentOS' and ansible_distribution_version|version_compare('ne', 7)
|
||||
|
||||
- name: install CentOS 7 specific requirements
|
||||
yum:
|
||||
name: "{{ item }}"
|
||||
update_cache: yes
|
||||
update_cache: yes
|
||||
state: present
|
||||
with_items:
|
||||
- "{{ directadmin_centos7_packages }}"
|
||||
- "{{ directadmin_centos7_packages }}"
|
||||
when: ansible_distribution == 'CentOS' and ansible_distribution_version|version_compare('=', 7)
|
||||
|
||||
@@ -5,9 +5,9 @@
|
||||
msg: "Variable: '{{ item }}' is not defined!"
|
||||
when: "{{ item }} is undefined or {{ item }} is none"
|
||||
with_items:
|
||||
- directadmin_client_id
|
||||
- directadmin_license_id
|
||||
- directadmin_hostname
|
||||
- directadmin_client_id
|
||||
- directadmin_license_id
|
||||
- directadmin_hostname
|
||||
|
||||
# Ensure prerequisites are installed for supported OS
|
||||
- include: prerequisites-Debian.yml
|
||||
|
||||
@@ -26,16 +26,16 @@
|
||||
when: da_present.status == 200
|
||||
|
||||
- block:
|
||||
- name: ensure directadmin path if remote options file is used
|
||||
file:
|
||||
path: "{{ directadmin_custombuild_path }}"
|
||||
recurse: yes
|
||||
state: directory
|
||||
- name: ensure directadmin path if remote options file is used
|
||||
file:
|
||||
path: "{{ directadmin_custombuild_path }}"
|
||||
recurse: yes
|
||||
state: directory
|
||||
|
||||
- name: try remote custombuild options file
|
||||
get_url:
|
||||
url: "{{ directadmin_custombuild_options_conf }}"
|
||||
dest: "{{ directadmin_custombuild_path }}/options.conf"
|
||||
- name: try remote custombuild options file
|
||||
get_url:
|
||||
url: "{{ directadmin_custombuild_options_conf }}"
|
||||
dest: "{{ directadmin_custombuild_path }}/options.conf"
|
||||
|
||||
when: directadmin_custombuild_options_conf is defined and directadmin_custombuild_options_conf is not none
|
||||
|
||||
|
||||
Reference in New Issue
Block a user