Add some fixes for http_proxy support.

tobami · Jul 1, 2014 · 981b460 · 981b460
1 parent 16407f7
commit 981b460
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/littlechef/solo.py b/littlechef/solo.py
@@ -106,7 +106,7 @@ def configure(current_node=None):
     }
     with settings(hide('everything')):
         try:
-            upload_template('solo.rb', '/etc/chef/',
+            upload_template('solo.rb.j2', '/etc/chef/solo.rb',
                             context=data, use_sudo=True, backup=False, template_dir=BASEDIR,
                             use_jinja=True, mode=0400)
         except SystemExit:

diff --git a/littlechef/solo.rb.j2 b/littlechef/solo.rb.j2
@@ -6,11 +6,9 @@ environment_path "{{node_work_path}}/environments"
 environment "{{environment}}"
 verbose_logging {{verbose}}
 verify_api_cert true
-
 {% if http_proxy %}
 http_proxy "{{http_proxy}}"
 {% endif %}
-
 {% if https_proxy %}
-http_proxy "{{https_proxy}}"
+https_proxy "{{https_proxy}}"
 {% endif %}
diff --git a/setup.py b/setup.py
@@ -22,7 +22,7 @@
     install_requires=['fabric>=1.5.4', 'argparse', 'jinja2>=2.7.3'],
     packages=['littlechef'],
     package_data={
-        'littlechef': ['solo.rb', 'environment.rb']
+        'littlechef': ['solo.rb.j2', 'environment.rb']
         # NOTE: Chef 10 only (environment.rb)
     },
     scripts=['fix'],