Skip to content

Commit

Permalink
Style: Don't use semicolons for multiple resources
Browse files Browse the repository at this point in the history 
From the sytleguide...
'Semicolons must not be used to declare multiple resources within a set
of curly braces.'
https://docs.puppet.com/guides/style_guide.html#resource-arrangement
  • Loading branch information
@alexjfisher
alexjfisher committed Sep 14, 2016
1 parent 287c152 commit 0c86b3a
Show file tree
Hide file tree
Showing 4 changed files with 97 additions and 89 deletions.
47 changes: 26 additions & 21 deletions manifests/package.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,27 +70,32 @@
content => template('mrepo/mrepo.conf.erb'),
}

file {
'/etc/mrepo.conf.d':
ensure => directory,
owner => $user,
group => $group,
mode => '0755';
'/var/cache/mrepo':
ensure => directory,
owner => $user,
group => $group,
mode => '0755';
$src_root:
ensure => directory,
owner => $user,
group => $group,
mode => '0755';
'/var/log/mrepo.log':
ensure => file,
owner => $user,
group => $group,
mode => '0640';
file { '/etc/mrepo.conf.d':
ensure => directory,
owner => $user,
group => $group,
mode => '0755',
}

file { '/var/cache/mrepo':
ensure => directory,
owner => $user,
group => $group,
mode => '0755',
}

file { $src_root:
ensure => directory,
owner => $user,
group => $group,
mode => '0755',
}

file { '/var/log/mrepo.log':
ensure => file,
owner => $user,
group => $group,
mode => '0640',
}

# Packages needed to mirror files and generate mirror metadata
Expand Down
109 changes: 55 additions & 54 deletions manifests/repo.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,42 +207,42 @@
require => Class['mrepo::package'],
logoutput => on_failure,
}
cron {
"Nightly synchronize repo ${name}":
user => $user,
ensure => absent;
"Weekly synchronize repo ${name}":
user => $user,
ensure => absent;
cron { "Nightly synchronize repo ${name}":
user => $user,
ensure => absent,
}
cron { "Weekly synchronize repo ${name}":
user => $user,
ensure => absent,
}
}
'nightly': {
cron {
"Nightly synchronize repo ${name}":
ensure => present,
command => $repo_command,
hour => $hour,
minute => $minute,
user => $user,
require => Class['mrepo::package'];
"Weekly synchronize repo ${name}":
user => $user,
ensure => absent;
cron { "Nightly synchronize repo ${name}":
ensure => present,
command => $repo_command,
hour => $hour,
minute => $minute,
user => $user,
require => Class['mrepo::package'],
}
cron { "Weekly synchronize repo ${name}":
user => $user,
ensure => absent,
}
}
'weekly': {
cron {
"Weekly synchronize repo ${name}":
ensure => present,
command => $repo_command,
weekday => '0',
hour => $hour,
minute => $minute,
user => $user,
require => Class['mrepo::package'];
"Nightly synchronize repo ${name}":
user => $user,
ensure => absent;
cron { "Weekly synchronize repo ${name}":
ensure => present,
command => $repo_command,
weekday => '0',
hour => $hour,
minute => $minute,
user => $user,
require => Class['mrepo::package'],
}
cron { "Nightly synchronize repo ${name}":
user => $user,
ensure => absent,
}
}
default: {
Expand Down Expand Up @@ -272,31 +272,32 @@
provider => shell,
logoutput => true,
}
file {
$www_root_subdir:
ensure => absent,
backup => false,
recurse => false,
force => true,
before => File[$src_root_subdir],
require => Exec["Unmount any mirrored ISOs for ${name}"];
"${mrepo::params::src_root}/${name}":
ensure => absent,
backup => false,
recurse => false,
force => true;
"/etc/mrepo.conf.d/${name}":
ensure => absent,
backup => false,
force => true;
file { $www_root_subdir:
ensure => absent,
backup => false,
recurse => false,
force => true,
before => File[$src_root_subdir],
require => Exec["Unmount any mirrored ISOs for ${name}"],
}
file { "${mrepo::params::src_root}/${name}":
ensure => absent,
backup => false,
recurse => false,
force => true,
}
file { "/etc/mrepo.conf.d/${name}":
ensure => absent,
backup => false,
force => true,
}
cron { "Nightly synchronize repo ${name}":
user => $user,
ensure => absent,
}
cron {
"Nightly synchronize repo ${name}":
user => $user,
ensure => absent;
"Weekly synchronize repo ${name}":
user => $user,
ensure => absent;
cron { "Weekly synchronize repo ${name}":
user => $user,
ensure => absent,
}
}
default: {
Expand Down
11 changes: 6 additions & 5 deletions manifests/repo/ncc.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,21 +48,22 @@
$real_name = mrepo_munge($name, $arch)
$src_root_subdir = "${mrepo::params::src_root}/${real_name}"

file {
"${src_root_subdir}/deviceid":
file { "${src_root_subdir}/deviceid":
ensure => present,
owner => $user,
group => $group,
mode => '0640',
backup => false,
content => $ncc_username;
"${src_root_subdir}/secret":
content => $ncc_username,
}

file { "${src_root_subdir}/secret":
ensure => present,
owner => $user,
group => $group,
mode => '0640',
backup => false,
content => $ncc_password;
content => $ncc_password,
}
}
}
Expand Down
19 changes: 10 additions & 9 deletions manifests/rhn.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,15 +76,16 @@
source => 'puppet:///modules/mrepo/RHNS-CA-CERT',
}

file {
'/usr/share/rhn':
ensure => directory,
owner => 'root',
group => 'root',
mode => '0755';
'/usr/share/rhn/RHNS-CA-CERT':
ensure => link,
target => '/usr/share/mrepo/rhn/RHNS-CA-CERT';
file { '/usr/share/rhn':
ensure => directory,
owner => 'root',
group => 'root',
mode => '0755',
}

file {'/usr/share/rhn/RHNS-CA-CERT':
ensure => link,
target => '/usr/share/mrepo/rhn/RHNS-CA-CERT',
}
}
}
Expand Down

0 comments on commit 0c86b3a

Please sign in to comment.