From 22870d80168af138616a8172c3d39016d40691a1 Mon Sep 17 00:00:00 2001 From: Dorian Pula Date: Mon, 16 May 2016 18:15:30 -0400 Subject: [PATCH] Change the supported systems and minimum Ansible version to more current versions. Simplify setup of mailsink dependency. --- README.md | 2 +- handlers/main.yml | 2 -- meta/main.yml | 1 + tasks/dev_email_server.yaml | 2 +- templates/{dev_supervisor => }/mailsink_supervisor.conf | 0 5 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 handlers/main.yml rename templates/{dev_supervisor => }/mailsink_supervisor.conf (100%) diff --git a/README.md b/README.md index d0eb5f8..97b910a 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Requirements - aptitude or python-apt (required by apt tasks) - python > 2.5 (required by ini_file tasks) -- Ansible >= 1.8.0 +- Ansible >= 2.0 This role is designed to work against a modern Ubuntu system. (Tested on Ubuntu 13.10 and 14.04) It should theoretically work on older versions of Ubuntu or Debian based systems. diff --git a/handlers/main.yml b/handlers/main.yml deleted file mode 100644 index 2197d4c..0000000 --- a/handlers/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# handlers file for ansible-rookeries diff --git a/meta/main.yml b/meta/main.yml index 8e4c31b..5aef8c5 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -9,6 +9,7 @@ galaxy_info: - name: Ubuntu versions: - trusty + - xenial categories: - development - web diff --git a/tasks/dev_email_server.yaml b/tasks/dev_email_server.yaml index 487cfd1..6344132 100644 --- a/tasks/dev_email_server.yaml +++ b/tasks/dev_email_server.yaml @@ -5,7 +5,7 @@ when: rookeries_environ_type == "dev" - name: upload supervisor configuration to web server home - template: src=dev_supervisor/mailsink_supervisor.conf dest=/etc/supervisor/conf.d/mailsink_supervisor.conf + template: src=mailsink_supervisor.conf dest=/etc/supervisor/conf.d/mailsink_supervisor.conf sudo: yes when: rookeries_environ_type == "dev" diff --git a/templates/dev_supervisor/mailsink_supervisor.conf b/templates/mailsink_supervisor.conf similarity index 100% rename from templates/dev_supervisor/mailsink_supervisor.conf rename to templates/mailsink_supervisor.conf