Merge pull request #9 from stone-payments/fix/duplicated_code

Remove duplicated code from RedHat and Debian
stone-payments · Aug 20, 2018 · 36cd9c8 · 36cd9c8
2 parents 249b422 + 70745ee
commit 36cd9c8
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 27 deletions.
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -6,10 +6,9 @@
   include: custom-whitelist.yml
   when: squid_custom_whitelist is defined and squid_custom_whitelist
 
-# Install RedHat-like
-- include: squid-RedHat.yml
-  when: ansible_os_family == 'RedHat'
+- name: install squid
+  package: name={{ squid_package }} state=present update_cache=yes
 
-# Install Debian-like
-- include: squid-Debian.yml
-  when: ansible_os_family == 'Debian'
+- name: copy template
+  template: src=squid.conf.j2 dest={{ squid_conf }} owner=root group=root mode=0644
+  notify: restart squid
diff --git a/tasks/squid-Debian.yml b/tasks/squid-Debian.yml
diff --git a/tasks/squid-RedHat.yml b/tasks/squid-RedHat.yml
diff --git a/vars/Debian.yml b/vars/Debian.yml
@@ -4,6 +4,3 @@ squid_daemon: squid
 squid_path: /etc/squid
 squid_conf: /etc/squid/squid.conf
 squid_cache_dir: /var/spool/squid
-
-squid_diskcache: 'ufs {{ squid_cache_dir }} 100 16 256'
-#squid_diskcache: '' # Disables cache
diff --git a/vars/RedHat.yml b/vars/RedHat.yml
@@ -4,6 +4,3 @@ squid_daemon: squid
 squid_path: /etc/squid
 squid_conf: /etc/squid/squid.conf
 squid_cache_dir: /var/spool/squid
-
-squid_diskcache: 'ufs {{ squid_cache_dir }} 100 16 256'
-#squid_diskcache: '' # Disables cache
diff --git a/vars/main.yml b/vars/main.yml
@@ -1,3 +1,4 @@
 ---
 # vars file for squid
-squid_acl_dir: /etc/squid/acl_files
+squid_diskcache: 'ufs {{ squid_cache_dir }} 100 16 256'
+squid_acl_dir: /etc/squid/acl_files