From 443db5a7c24fc7186ed10d9dc5af5b8eaef88ede Mon Sep 17 00:00:00 2001 From: Stefan Dietrich Date: Sun, 31 Aug 2014 15:46:57 +0200 Subject: [PATCH] (MODULES-1200) Fix inconsistent header across files --- manifests/conf.pp | 2 +- manifests/init.pp | 8 ++++---- manifests/pin.pp | 2 +- manifests/release.pp | 2 +- manifests/source.pp | 2 +- manifests/unattended_upgrades.pp | 4 ++-- spec/classes/apt_spec.rb | 8 ++++---- spec/classes/release_spec.rb | 2 +- spec/defines/conf_spec.rb | 4 ++-- spec/defines/source_spec.rb | 8 ++++---- templates/15update-stamp.erb | 1 + templates/_header.erb | 1 + templates/conf.erb | 1 + templates/progressbar.erb | 1 + templates/proxy.erb | 1 + templates/release.erb | 1 + templates/source.list.erb | 1 - templates/unauth.erb | 1 + 18 files changed, 28 insertions(+), 22 deletions(-) create mode 100644 templates/15update-stamp.erb create mode 100644 templates/_header.erb create mode 100644 templates/conf.erb create mode 100644 templates/progressbar.erb create mode 100644 templates/proxy.erb create mode 100644 templates/release.erb create mode 100644 templates/unauth.erb diff --git a/manifests/conf.pp b/manifests/conf.pp index 3c4cb19..318422e 100644 --- a/manifests/conf.pp +++ b/manifests/conf.pp @@ -10,7 +10,7 @@ define apt::conf ( file { "${apt_conf_d}/${priority}${name}": ensure => $ensure, - content => $content, + content => template('apt/_header.erb', 'apt/conf.erb'), owner => root, group => root, mode => '0644', diff --git a/manifests/init.pp b/manifests/init.pp index d64b013..5f33fdb 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -92,7 +92,7 @@ class apt( file { '/etc/apt/apt.conf.d/15update-stamp': ensure => 'file', - content => 'APT::Update::Post-Invoke-Success {"touch /var/lib/apt/periodic/update-success-stamp 2>/dev/null || true";};', + content => template('apt/_header.erb', 'apt/15update-stamp.erb'), group => 'root', mode => '0644', owner => 'root', @@ -144,7 +144,7 @@ class apt( true: { file { '99progressbar': ensure => present, - content => 'Dpkg::Progress-Fancy "1";', + content => template('apt/_header.erb', 'apt/progressbar.erb'), path => "${apt_conf_d}/99progressbar", } } @@ -162,7 +162,7 @@ class apt( true: { file { '99unauth': ensure => present, - content => "APT::Get::AllowUnauthenticated 1;\n", + content => template('apt/_header.erb', 'apt/unauth.erb'), path => "${apt_conf_d}/99unauth", } } @@ -188,7 +188,7 @@ class apt( file { '01proxy': ensure => present, path => "${apt_conf_d}/01proxy", - content => "Acquire::http::Proxy \"http://${proxy_host}:${proxy_port}\";\n", + content => template('apt/_header.erb', 'apt/proxy.erb'), notify => Exec['apt_update'], mode => '0644', owner => root, diff --git a/manifests/pin.pp b/manifests/pin.pp index 54961ec..935dc22 100644 --- a/manifests/pin.pp +++ b/manifests/pin.pp @@ -76,6 +76,6 @@ define apt::pin( owner => root, group => root, mode => '0644', - content => template('apt/pin.pref.erb'), + content => template('apt/_header.erb', 'apt/pin.pref.erb'), } } diff --git a/manifests/release.pp b/manifests/release.pp index 6e0a38f..ae12dd4 100644 --- a/manifests/release.pp +++ b/manifests/release.pp @@ -12,6 +12,6 @@ class apt::release ( owner => root, group => root, mode => '0644', - content => "APT::Default-Release \"${release_id}\";" + content => template('apt/_header.erb', 'apt/release.erb'), } } diff --git a/manifests/source.pp b/manifests/source.pp index c5ed3a6..f6647df 100644 --- a/manifests/source.pp +++ b/manifests/source.pp @@ -44,7 +44,7 @@ define apt::source( owner => root, group => root, mode => '0644', - content => template("${module_name}/source.list.erb"), + content => template('apt/_header.erb', 'apt/source.list.erb'), notify => Exec['apt_update'], } diff --git a/manifests/unattended_upgrades.pp b/manifests/unattended_upgrades.pp index 069c359..b835b9a 100644 --- a/manifests/unattended_upgrades.pp +++ b/manifests/unattended_upgrades.pp @@ -64,7 +64,7 @@ class apt::unattended_upgrades ( owner => 'root', group => 'root', mode => '0644', - content => template('apt/50unattended-upgrades.erb'), + content => template('apt/_header.erb', 'apt/50unattended-upgrades.erb'), require => Package['unattended-upgrades'], } @@ -73,7 +73,7 @@ class apt::unattended_upgrades ( owner => 'root', group => 'root', mode => '0644', - content => template('apt/10periodic.erb'), + content => template('apt/_header.erb', 'apt/10periodic.erb'), require => Package['unattended-upgrades'], } } diff --git a/spec/classes/apt_spec.rb b/spec/classes/apt_spec.rb index 0a1c0a1..f65ed03 100644 --- a/spec/classes/apt_spec.rb +++ b/spec/classes/apt_spec.rb @@ -42,7 +42,7 @@ describe 'apt', :type => :class do 'group' => 'root', 'mode' => '0644', 'owner' => 'root', - }).with_content('APT::Update::Post-Invoke-Success {"touch /var/lib/apt/periodic/update-success-stamp 2>/dev/null || true";};') + }).with_content(/APT::Update::Post-Invoke-Success \{"touch \/var\/lib\/apt\/periodic\/update-success-stamp 2>\/dev\/null \|\| true";\};/) end it { should contain_file('old-proxy-file').that_notifies('Exec[apt_update]').only_with({ @@ -94,20 +94,20 @@ describe 'apt', :type => :class do it { should contain_file('99progressbar').only_with({ 'ensure' => 'present', - 'content' => 'Dpkg::Progress-Fancy "1";', + 'content' => /Dpkg::Progress-Fancy "1";/, 'path' => '/etc/apt/apt.conf.d/99progressbar', })} it { should contain_file('99unauth').only_with({ 'ensure' => 'present', - 'content' => "APT::Get::AllowUnauthenticated 1;\n", + 'content' => /APT::Get::AllowUnauthenticated 1;/, 'path' => '/etc/apt/apt.conf.d/99unauth', })} it { should contain_file('01proxy').that_notifies('Exec[apt_update]').only_with({ 'ensure' => 'present', 'path' => '/etc/apt/apt.conf.d/01proxy', - 'content' => "Acquire::http::Proxy \"http://foo:9876\";\n", + 'content' => /Acquire::http::Proxy "http:\/\/foo:9876";/, 'notify' => 'Exec[apt_update]', 'mode' => '0644', 'owner' => 'root', diff --git a/spec/classes/release_spec.rb b/spec/classes/release_spec.rb index e43f449..f8c6512 100644 --- a/spec/classes/release_spec.rb +++ b/spec/classes/release_spec.rb @@ -16,7 +16,7 @@ describe 'apt::release', :type => :class do "mode" => "0644", "owner" => "root", "group" => "root", - "content" => "APT::Default-Release \"#{param_set[:release_id]}\";" + "content" => /APT::Default-Release "#{param_set[:release_id]}";/ }) } end diff --git a/spec/defines/conf_spec.rb b/spec/defines/conf_spec.rb index ec4e229..2c1752f 100644 --- a/spec/defines/conf_spec.rb +++ b/spec/defines/conf_spec.rb @@ -19,7 +19,7 @@ describe 'apt::conf', :type => :define do it { should contain_file(filename).with({ 'ensure' => 'present', - 'content' => "Apt::Install-Recommends 0;\nApt::AutoRemove::InstallRecommends 1;\n", + 'content' => /Apt::Install-Recommends 0;\nApt::AutoRemove::InstallRecommends 1;/, 'owner' => 'root', 'group' => 'root', 'mode' => '0644', @@ -42,7 +42,7 @@ describe 'apt::conf', :type => :define do it { should contain_file(filename).with({ 'ensure' => 'absent', - 'content' => "Apt::Install-Recommends 0;\nApt::AutoRemove::InstallRecommends 1;\n", + 'content' => /Apt::Install-Recommends 0;\nApt::AutoRemove::InstallRecommends 1;/, 'owner' => 'root', 'group' => 'root', 'mode' => '0644', diff --git a/spec/defines/source_spec.rb b/spec/defines/source_spec.rb index b4d3799..8ca7f8e 100644 --- a/spec/defines/source_spec.rb +++ b/spec/defines/source_spec.rb @@ -29,7 +29,7 @@ describe 'apt::source', :type => :define do 'owner' => 'root', 'group' => 'root', 'mode' => '0644', - }).with_content(/#file generated by puppet\n# my_source\ndeb-src wheezy main\n/) + }).with_content(/# my_source\ndeb-src wheezy main\n/) } end @@ -65,7 +65,7 @@ describe 'apt::source', :type => :define do 'owner' => 'root', 'group' => 'root', 'mode' => '0644', - }).with_content(/#file generated by puppet\n# foo\ndeb \[arch=x86_64 trusted=yes\] http:\/\/debian\.mirror\.iweb\.ca\/debian\/ sid testing\n/).without_content(/deb-src/) + }).with_content(/# foo\ndeb \[arch=x86_64 trusted=yes\] http:\/\/debian\.mirror\.iweb\.ca\/debian\/ sid testing\n/).without_content(/deb-src/) } it { is_expected.to contain_apt__pin('my_source').that_comes_before('File[my_source.list]').with({ @@ -115,7 +115,7 @@ describe 'apt::source', :type => :define do 'owner' => 'root', 'group' => 'root', 'mode' => '0644', - }).with_content(/#file generated by puppet\n# my_source\ndeb \[trusted=yes\] wheezy main\n/) + }).with_content(/# my_source\ndeb \[trusted=yes\] wheezy main\n/) } end @@ -140,7 +140,7 @@ describe 'apt::source', :type => :define do 'owner' => 'root', 'group' => 'root', 'mode' => '0644', - }).with_content(/#file generated by puppet\n# my_source\ndeb-src \[arch=x86_64 \] wheezy main\n/) + }).with_content(/# my_source\ndeb-src \[arch=x86_64 \] wheezy main\n/) } end diff --git a/templates/15update-stamp.erb b/templates/15update-stamp.erb new file mode 100644 index 0000000..14ead83 --- /dev/null +++ b/templates/15update-stamp.erb @@ -0,0 +1 @@ +APT::Update::Post-Invoke-Success {"touch /var/lib/apt/periodic/update-success-stamp 2>/dev/null || true";}; diff --git a/templates/_header.erb b/templates/_header.erb new file mode 100644 index 0000000..487e581 --- /dev/null +++ b/templates/_header.erb @@ -0,0 +1 @@ +# This file is managed by Puppet. DO NOT EDIT. diff --git a/templates/conf.erb b/templates/conf.erb new file mode 100644 index 0000000..a35d1d4 --- /dev/null +++ b/templates/conf.erb @@ -0,0 +1 @@ +<%= @content -%> diff --git a/templates/progressbar.erb b/templates/progressbar.erb new file mode 100644 index 0000000..d3d9278 --- /dev/null +++ b/templates/progressbar.erb @@ -0,0 +1 @@ +Dpkg::Progress-Fancy "1"; diff --git a/templates/proxy.erb b/templates/proxy.erb new file mode 100644 index 0000000..accb0cc --- /dev/null +++ b/templates/proxy.erb @@ -0,0 +1 @@ +Acquire::http::Proxy "http://<%= @proxy_host %>:<%= @proxy_port %>"; diff --git a/templates/release.erb b/templates/release.erb new file mode 100644 index 0000000..08760af --- /dev/null +++ b/templates/release.erb @@ -0,0 +1 @@ +APT::Default-Release "<%= @release_id %>"; diff --git a/templates/source.list.erb b/templates/source.list.erb index 7514766..b50be8d 100644 --- a/templates/source.list.erb +++ b/templates/source.list.erb @@ -1,4 +1,3 @@ -#file generated by puppet # <%= @comment %> <%- if @include_deb then -%> deb <%- if @architecture or @trusted_source -%> diff --git a/templates/unauth.erb b/templates/unauth.erb new file mode 100644 index 0000000..77edd28 --- /dev/null +++ b/templates/unauth.erb @@ -0,0 +1 @@ +APT::Get::AllowUnauthenticated 1; -- 2.32.3