aboutsummaryrefslogtreecommitdiff
path: root/manifests/init.pp
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2010-12-07 13:18:41 -0500
committerMicah Anderson <micah@riseup.net>2010-12-07 13:18:41 -0500
commite15283b781f35779a75415725cd315104879aa67 (patch)
treeb40a8779915a1b77b826181ca80de6886b23cba3 /manifests/init.pp
parentbb03c32b4589400bd03d76645db6d8bb869424ed (diff)
downloadpuppet-apt-e15283b781f35779a75415725cd315104879aa67.tar.gz
puppet-apt-e15283b781f35779a75415725cd315104879aa67.tar.bz2
format standardization
Diffstat (limited to 'manifests/init.pp')
-rw-r--r--manifests/init.pp33
1 files changed, 14 insertions, 19 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index e7eac33..4ca2b2e 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -88,23 +88,23 @@ class apt {
}
apt_conf { "02show_upgraded":
- source => ["puppet:///modules/site-apt/${fqdn}/02show_upgraded",
- "puppet:///modules/site-apt/02show_upgraded",
- "puppet:///modules/apt/02show_upgraded"]
+ source => [ "puppet:///modules/site-apt/${fqdn}/02show_upgraded",
+ "puppet:///modules/site-apt/02show_upgraded",
+ "puppet:///modules/apt/02show_upgraded" ]
}
if ( $virtual == "vserver" ) {
apt_conf { "03clean_vserver":
- source => ["puppet:///modules/site-apt/${fqdn}/03clean_vserver",
- "puppet:///modules/site-apt/03clean_vserver",
- "puppet:///modules/apt/03clean_vserver"]
+ source => [ "puppet:///modules/site-apt/${fqdn}/03clean_vserver",
+ "puppet:///modules/site-apt/03clean_vserver",
+ "puppet:///modules/apt/03clean_vserver" ]
}
}
else {
apt_conf { "03clean":
- source => ["puppet:///modules/site-apt/${fqdn}/03clean",
- "puppet:///modules/site-apt/03clean",
- "puppet:///modules/apt/03clean"]
+ source => [ "puppet:///modules/site-apt/${fqdn}/03clean",
+ "puppet:///modules/site-apt/03clean",
+ "puppet:///modules/apt/03clean" ]
}
}
@@ -121,13 +121,9 @@ class apt {
# backward compatibility: upgrade from previous versions of this module.
file {
- ["/etc/apt/apt.conf.d/from_puppet",
- "/etc/apt/apt.conf.d/99from_puppet"
- ]:
+ [ "/etc/apt/apt.conf.d/from_puppet", "/etc/apt/apt.conf.d/99from_puppet" ]:
ensure => 'absent',
- require => [ Apt_conf['02show_upgraded'],
- Apt_conf['03clean'],
- ],
+ require => [ Apt_conf['02show_upgraded'], Apt_conf['03clean'] ];
}
# watch .d directories and ensure they are present
@@ -143,13 +139,12 @@ class apt {
'refresh_apt':
command => '/usr/bin/apt-get update && sleep 1',
refreshonly => true,
- subscribe => [ File['/etc/apt/apt.conf.d'],
- Config_file['/etc/apt/sources.list'] ];
+ subscribe => [ File['/etc/apt/apt.conf.d'], Config_file['/etc/apt/sources.list'] ];
+
'update_apt':
command => '/usr/bin/apt-get update && /usr/bin/apt-get autoclean',
refreshonly => true,
- require => [ File['/etc/apt/apt.conf.d',
- '/etc/apt/preferences'],
+ require => [ File['/etc/apt/apt.conf.d', '/etc/apt/preferences' ],
Config_file['/etc/apt/sources.list'] ],
loglevel => info,
# Another Semaphor for all packages to reference