Merge pull request #2296 from abhishek-sa1/release_1.6

Proxy configuration fix
dell · Jul 10, 2024 · 3c1fd6c · 3c1fd6c
2 parents b01989f + c2b5683
commit 3c1fd6c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/prepare_cp/roles/configure_proxy/tasks/configure_proxy_ubuntu.yml b/prepare_cp/roles/configure_proxy/tasks/configure_proxy_ubuntu.yml
@@ -45,10 +45,11 @@
   ansible.builtin.include_tasks: configure_user_registry_port.yml
 
 - name: Configure squid proxy
-  ansible.builtin.replace:
+  ansible.builtin.lineinfile:
     path: "{{ squid_proxy_conf_path }}"
     regexp: "{{ squid_proxy_conf_regxp }}"
-    replace: "{{ squid_proxy_conf_replace }}"
+    insertafter: EOF
+    line: "{{ squid_proxy_conf_replace }}"
   register: configure_proxy
 
 - name: Restart squid service

diff --git a/prepare_cp/roles/configure_proxy/vars/main.yml b/prepare_cp/roles/configure_proxy/vars/main.yml
@@ -15,7 +15,7 @@
 
 # Usage: configue_proxy_ubuntu.yml
 squid_proxy_conf_path: /etc/squid/squid.conf
-squid_proxy_conf_regxp: "^#http_access allow localnet"
+squid_proxy_conf_regxp: "^#(.*)http_access allow localnet"
 squid_proxy_conf_replace: "http_access allow localnet"
 repo_update_fail_msg: "Failed. Unable to run apt update.
 Please make sure all required repos are reachable. Remove or Update unreachable repos configured and re-run the playbook."