Merge pull request #59 from hashicorp/no-proxy-fix

add repl_cidr to no_proxy if set
hashicorp · Dec 12, 2019 · ee501a4 · ee501a4
2 parents d5b0b5b + 2412c44
commit ee501a4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/modules/configs/files/install-ptfe.sh b/modules/configs/files/install-ptfe.sh
@@ -9,6 +9,11 @@ if [ -s /etc/ptfe/proxy-url ]; then
   export http_proxy
   export https_proxy
   export no_proxy=10.0.0.0/8,127.0.0.1,169.254.169.254
+  if [[ $(< /etc/ptfe/repl-cidr) != "" ]]; then
+      repl_cidr=$(cat /etc/ptfe/repl-cidr)
+      export repl_cidr
+      export no_proxy=$no_proxy,$repl_cidr
+  fi
 fi
 
 ### Decide on distribution specific things

diff --git a/modules/configs/templates/cloud-init/cloud-config.yaml b/modules/configs/templates/cloud-init/cloud-config.yaml
@@ -78,6 +78,17 @@ write_files:
   permissions: "0755"
   encoding: b64
   content: ${proxy_b64}
+
+%{ if repl_cidr != "" }
+- path: /etc/profile.d/proxy.sh
+  owner: root:root
+  permissions: "0755"
+  content: |
+    export http_proxy="${proxy_url}"
+    export https_proxy="${proxy_url}"
+    export no_proxy=10.0.0.0/8,127.0.0.1,169.254.169.254,${repl_cidr}
+%{ endif }
+
 %{ endif ~}
 %{ if role == "main" }
 - path: /etc/replicated.rli