From 5b843819a670217ca8f972010c6c8e2f639204ec Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Sun, 21 Feb 2016 00:19:27 +0100 Subject: [PATCH] Fixing triggering of interfaces in production. Configured squid defaults as determined. --- roles/nethcfg/defaults/main.yml | 1 + roles/nethcfg/tasks/reconfig_nic.yml | 5 +++++ roles/nethcfg/tasks/reconfig_srv.yml | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/roles/nethcfg/defaults/main.yml b/roles/nethcfg/defaults/main.yml index 34cf456..0c219ff 100644 --- a/roles/nethcfg/defaults/main.yml +++ b/roles/nethcfg/defaults/main.yml @@ -3,3 +3,4 @@ extnic: wan0 intnic: lan0 force_regen_ca: false force_ibay_shared: false +development: false diff --git a/roles/nethcfg/tasks/reconfig_nic.yml b/roles/nethcfg/tasks/reconfig_nic.yml index 2f57fdc..60674b7 100644 --- a/roles/nethcfg/tasks/reconfig_nic.yml +++ b/roles/nethcfg/tasks/reconfig_nic.yml @@ -1,19 +1,24 @@ - name: Configurazione scheda di rete esterna shell: /sbin/e-smith/db networks setprop {{ extnic }} role red bootproto dhcp + when: development|bool become: yes - name: Configurazione scheda di rete interna shell: /sbin/e-smith/db networks setprop {{ intnic }} role green ipaddr {{ ansible_local.domain.serverip }} netmask {{ ansible_local.domain.servernetmask }} + when: development|bool become: yes - name: Attivo configurazioni di rete shell: /sbin/e-smith/signal-event interface-update + when: development|bool become: yes - name: Configurazione rete trusted shell: /sbin/e-smith/db networks set {{ ansible_local.domain.servernet }} network Description "Local LAN" Mask {{ ansible_local.domain.servernetmask }} + when: development|bool become: yes - name: Modifico configurazioni shell: /sbin/e-smith/signal-event trusted-networks-modify + when: development|bool become: yes diff --git a/roles/nethcfg/tasks/reconfig_srv.yml b/roles/nethcfg/tasks/reconfig_srv.yml index 0ba28bd..26d773e 100644 --- a/roles/nethcfg/tasks/reconfig_srv.yml +++ b/roles/nethcfg/tasks/reconfig_srv.yml @@ -190,10 +190,10 @@ become: yes ignore_errors: yes register: chk_squid - changed_when: "'GreenMode=transparent_ssl' not in chk_squid.stdout" + changed_when: "'GreenMode=transparent' not in chk_squid.stdout" - name: Configurazione squid - shell: /sbin/e-smith/db configuration setprop squid BlueMode transparent_ssl GreenMode transparent_ssl PortBlock enabled status enabled DiskCache enabled DiskCacheSize 500 + shell: /sbin/e-smith/db configuration setprop squid BlueMode transparent GreenMode transparent PortBlock disabled status enabled DiskCache enabled DiskCacheSize 2000 become: yes when: chk_squid|changed