Merge pull request #283 from johanfleury/master

Change proxy's configuration file to be consistent with other config files in apt.conf.d
puppetlabs · Apr 12, 2014 · 81a3f9d · 81a3f9d
2 parents d946753 + 9e78925
commit 81a3f9d
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -134,15 +134,21 @@
     default => present
   }
 
-  file { 'configure-apt-proxy':
+  file { '01proxy':
     ensure  => $proxy_set,
-    path    => "${apt_conf_d}/proxy",
+    path    => "${apt_conf_d}/01proxy",
     content => "Acquire::http::Proxy \"http://${proxy_host}:${proxy_port}\";\n",
     notify  => Exec['apt_update'],
     mode    => '0644',
     owner   => root,
     group   => root,
   }
+
+  file { 'old-proxy-file':
+    ensure  => absent,
+    path    => "${apt_conf_d}/proxy",
+    notify  => Exec['apt_update'],
+  }
 
   # Need anchor to provide containment for dependencies.
   anchor { 'apt::update':

diff --git a/spec/acceptance/apt_spec.rb b/spec/acceptance/apt_spec.rb
@@ -75,10 +75,13 @@ class { 'apt':
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file('/etc/apt/apt.conf.d/proxy') do
+    describe file('/etc/apt/apt.conf.d/01proxy') do
       it { should be_file }
       it { should contain 'Acquire::http::Proxy "http://localhost:7042\";' }
     end
+    describe file('/etc/apt/apt.conf.d/proxy') do
+      it { should_not be_file }
+    end
   end
 
   context 'purge_sources' do
@@ -117,10 +120,13 @@ class { 'apt':
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file('/etc/apt/apt.conf.d/proxy') do
+    describe file('/etc/apt/apt.conf.d/01proxy') do
       it { should be_file }
       it { should contain 'Acquire::http::Proxy "http://localhost:7042\";' }
     end
+    describe file('/etc/apt/apt.conf.d/proxy') do
+      it { should_not be_file }
+    end
   end
 
   context 'purge_sources' do

diff --git a/spec/classes/apt_spec.rb b/spec/classes/apt_spec.rb
@@ -162,14 +162,14 @@
       describe 'when setting a proxy' do
         it {
           if param_hash[:proxy_host]
-            should contain_file('configure-apt-proxy').with(
-              'path'    => '/etc/apt/apt.conf.d/proxy',
+            should contain_file('01proxy').with(
+              'path'    => '/etc/apt/apt.conf.d/01proxy',
               'content' => "Acquire::http::Proxy \"http://#{param_hash[:proxy_host]}:#{param_hash[:proxy_port]}\";\n",
               'notify'  => "Exec[apt_update]"
             )
           else
-            should contain_file('configure-apt-proxy').with(
-              'path'    => '/etc/apt/apt.conf.d/proxy',
+            should contain_file('01proxy').with(
+              'path'    => '/etc/apt/apt.conf.d/01proxy',
               'notify'  => 'Exec[apt_update]',
               'ensure'  => 'absent'
             )