From 687042298e18b6331b890eced6c328b35c44ad86 Mon Sep 17 00:00:00 2001 From: hyperized Date: Mon, 3 Sep 2018 21:00:51 +0200 Subject: [PATCH] Fix test & syntax (#4) * Optimize syntax * Fix typo --- .gitignore | 1 + .travis.yml | 16 +-- defaults/main.yml | 250 ++++++++++++++++----------------- meta/main.yml | 7 +- tasks/prerequisites-Debian.yml | 6 +- tasks/prerequisites-RedHat.yml | 10 +- tasks/prerequisites.yml | 6 +- tasks/setup.yml | 18 +-- tests/test.yml | 2 +- 9 files changed, 159 insertions(+), 157 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..723ef36 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.idea \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 36bbf62..1f140b3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,18 +12,18 @@ addons: - python-pip install: - # Install ansible - - pip install ansible +# Install ansible +- pip install ansible - # Check ansible version - - ansible --version +# Check ansible version +- ansible --version - # Create ansible.cfg with correct roles_path - - printf '[defaults]\nroles_path=../' >ansible.cfg +# Create ansible.cfg with correct roles_path +- printf '[defaults]\nroles_path=../' >ansible.cfg script: - # Basic role syntax check - - ansible-playbook tests/test.yml -i tests/inventory --syntax-check +# Basic role syntax check +- ansible-playbook tests/test.yml -i tests/inventory --syntax-check notifications: webhooks: https://galaxy.ansible.com/api/v1/notifications/ \ No newline at end of file diff --git a/defaults/main.yml b/defaults/main.yml index 26ca769..ab989dd 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -15,138 +15,138 @@ directadmin_cache_timeout: 3600 # Packages - http://help.directadmin.com/item.php?id=354 directadmin_debian6_packages: - - gcc - - g++ - - make - - flex - - bison - - openssl - - libssl-dev - - perl - - perl-base - - perl-modules - - libperl-dev - - libaio1 - - libaio-dev - - zlib1g - - zlib1g-dev - - libcap-dev - - bzip2 - - automake - - autoconf - - libtool - - cmake - - pkg-config - - python - - libreadline-dev - - libdb4.8-dev - - libsasl2-dev - - patch +- gcc +- g++ +- make +- flex +- bison +- openssl +- libssl-dev +- perl +- perl-base +- perl-modules +- libperl-dev +- libaio1 +- libaio-dev +- zlib1g +- zlib1g-dev +- libcap-dev +- bzip2 +- automake +- autoconf +- libtool +- cmake +- pkg-config +- python +- libreadline-dev +- libdb4.8-dev +- libsasl2-dev +- patch directadmin_debian7_packages: - - gcc - - g++ - - make - - flex - - bison - - openssl - - libssl-dev - - perl - - perl-base - - perl-modules - - libperl-dev - - libaio1 - - libaio-dev - - zlib1g - - zlib1g-dev - - libcap-dev - - bzip2 - - automake - - autoconf - - libtool - - cmake - - pkg-config - - python - - libdb-dev - - libsasl2-dev - - libncurses5-dev - - patch +- gcc +- g++ +- make +- flex +- bison +- openssl +- libssl-dev +- perl +- perl-base +- perl-modules +- libperl-dev +- libaio1 +- libaio-dev +- zlib1g +- zlib1g-dev +- libcap-dev +- bzip2 +- automake +- autoconf +- libtool +- cmake +- pkg-config +- python +- libdb-dev +- libsasl2-dev +- libncurses5-dev +- patch directadmin_debian8_packages: - - gcc - - g++ - - make - - flex - - bison - - openssl - - libssl-dev - - perl - - perl-base - - perl-modules - - libperl-dev - - libaio1 - - libaio-dev - - zlib1g - - zlib1g-dev - - libcap-dev - - bzip2 - - automake - - autoconf - - libtool - - cmake - - pkg-config - - python - - libdb-dev - - libsasl2-dev - - libncurses5-dev - - libsystemd-dev - - bind9 - - quota - - libsystemd-daemon0 - - patch - - libjemalloc-dev +- gcc +- g++ +- make +- flex +- bison +- openssl +- libssl-dev +- perl +- perl-base +- perl-modules +- libperl-dev +- libaio1 +- libaio-dev +- zlib1g +- zlib1g-dev +- libcap-dev +- bzip2 +- automake +- autoconf +- libtool +- cmake +- pkg-config +- python +- libdb-dev +- libsasl2-dev +- libncurses5-dev +- libsystemd-dev +- bind9 +- quota +- libsystemd-daemon0 +- patch +- libjemalloc-dev directadmin_rhel_generic_packages: - - gcc - - gcc-c++ - - flex - - bison - - make - - bind - - bind-libs - - bind-utils - - openssl - - openssl-devel - - perl - - quota - - libaio - - libcom_err-devel - - libcurl-devel - - gd - - zlib-devel - - zip - - unzip - - libcap-devel - - cronie - - bzip2 - - cyrus-sasl-devel - - perl-ExtUtils-Embed - - autoconf - - automake - - libtool - - which - - patch - - mailx - - bzip2-devel - - lsof +- gcc +- gcc-c++ +- flex +- bison +- make +- bind +- bind-libs +- bind-utils +- openssl +- openssl-devel +- perl +- quota +- libaio +- libcom_err-devel +- libcurl-devel +- gd +- zlib-devel +- zip +- unzip +- libcap-devel +- cronie +- bzip2 +- cyrus-sasl-devel +- perl-ExtUtils-Embed +- autoconf +- automake +- libtool +- which +- patch +- mailx +- bzip2-devel +- lsof directadmin_rhel_packages: - - db4-devel +- db4-devel directadmin_centos7_packages: - - psmisc - - net-tools - - systemd-devel - - libdb-devel - - perl-DBI - - xfsprogs +- psmisc +- net-tools +- systemd-devel +- libdb-devel +- perl-DBI +- xfsprogs diff --git a/meta/main.yml b/meta/main.yml index ad5afea..6b495c5 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -1,3 +1,4 @@ +--- galaxy_info: author: Gerben Geijteman description: Deploy DirectAdmin with Ansible @@ -17,7 +18,7 @@ galaxy_info: - squeeze - wheezy galaxy_tags: - - system - - web - - directadmin + - system + - web + - directadmin dependencies: [] \ No newline at end of file diff --git a/tasks/prerequisites-Debian.yml b/tasks/prerequisites-Debian.yml index 7061e72..91d0927 100644 --- a/tasks/prerequisites-Debian.yml +++ b/tasks/prerequisites-Debian.yml @@ -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'" diff --git a/tasks/prerequisites-RedHat.yml b/tasks/prerequisites-RedHat.yml index 793e176..fd62e6f 100644 --- a/tasks/prerequisites-RedHat.yml +++ b/tasks/prerequisites-RedHat.yml @@ -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) diff --git a/tasks/prerequisites.yml b/tasks/prerequisites.yml index 46182ce..310eb65 100644 --- a/tasks/prerequisites.yml +++ b/tasks/prerequisites.yml @@ -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 diff --git a/tasks/setup.yml b/tasks/setup.yml index 9c95692..65310e9 100644 --- a/tasks/setup.yml +++ b/tasks/setup.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 diff --git a/tests/test.yml b/tests/test.yml index 6f3c2eb..30b174d 100644 --- a/tests/test.yml +++ b/tests/test.yml @@ -2,4 +2,4 @@ - hosts: localhost remote_user: root roles: - - ansible-directadmin \ No newline at end of file + - ansible-directadmin \ No newline at end of file