Skip to content
Snippets Groups Projects
Commit 9f37a5a1 authored by Thomas Bellman's avatar Thomas Bellman
Browse files

Use single-quoted strings literals where possible.

Using string literals delimited by apostrophes (') instead of double
quotes (") should be a tiny bit more efficient, and follows standard
Puppet style guidelines as well.
parent 7b5256d7
Branches
No related tags found
No related merge requests found
......@@ -139,7 +139,7 @@ import "nsc-puppet-utils"
* convenvience, "Include(.)" and "Exclude(.)" can be abbreviated
* to "+" and "-", respectively, so for example
*
* ["-fs /tmp", "-dir /.../nobackup", "- /etc/.../*", "+ /etc/shadow"]
* ['-fs /tmp', '-dir /.../nobackup', '- /etc/.../*', '+ /etc/shadow']
*
* would translate to
*
......@@ -167,8 +167,8 @@ define tsmclient($serveraddress, $nodename=$fqdn,
$tsmpassworddir = $tsmclient::vars::tsmpassworddir
$sysoptions_defaults = [
"errorlogname /var/log/dsmerror.log",
"tcpport 1500",
'errorlogname /var/log/dsmerror.log',
'tcpport 1500',
]
$tsm_servername = $name
$tsm_nodename = $nodename
......@@ -195,23 +195,23 @@ define tsmclient($serveraddress, $nodename=$fqdn,
file {
$tsmpassworddir:
ensure => directory,
owner => "root", group => "root", mode => 0755,
require => Package["TIVsm-BA"];
owner => 'root', group => 'root', mode => 0755,
require => Package['TIVsm-BA'];
"${tsmdir}/bin/dsm.opt":
ensure => file,
content => template("tsmclient/dsm.opt.erb"),
owner => "root", group => "root", mode => 0444,
require => Package["TIVsm-BA"], notify => Service["dsmcad"];
content => template('tsmclient/dsm.opt.erb'),
owner => 'root', group => 'root', mode => 0444,
require => Package['TIVsm-BA'], notify => Service['dsmcad'];
"${tsmdir}/bin/dsm.sys":
ensure => file,
content => template("tsmclient/dsm.sys.erb"),
owner => "root", group => "root", mode => 0444,
require => Package["TIVsm-BA"], notify => Service["dsmcad"];
content => template('tsmclient/dsm.sys.erb'),
owner => 'root', group => 'root', mode => 0444,
require => Package['TIVsm-BA'], notify => Service['dsmcad'];
"${tsmdir}/bin/include_exclude":
ensure => file,
content => template("tsmclient/include_exclude.erb"),
owner => "root", group => "root", mode => 0444,
require => Package["TIVsm-BA"], notify => Service["dsmcad"];
content => template('tsmclient/include_exclude.erb'),
owner => 'root', group => 'root', mode => 0444,
require => Package['TIVsm-BA'], notify => Service['dsmcad'];
}
$pw_save_file = $tsmclient::siteconfig::password_save_location
......@@ -226,8 +226,8 @@ define tsmclient($serveraddress, $nodename=$fqdn,
"${tsmpassworddir}/TSM.PWD":
ensure => file, links => follow, replace => false,
source => $tsmclient::siteconfig::password_source,
owner => "root", group => "root", mode => 0600,
notify => Service["dsmcad"];
owner => 'root', group => 'root', mode => 0600,
notify => Service['dsmcad'];
}
}
}
......@@ -249,16 +249,16 @@ class tsmclient::dsmtca_nosuid
file {
"${tsmclient::vars::tsmdir}/bin/dsmtca":
ensure => file,
owner => "root", group => "bin", mode => 0755,
require => Package["TIVsm-BA"];
owner => 'root', group => 'bin', mode => 0755,
require => Package['TIVsm-BA'];
"${tsmclient::vars::tsmprefix}/client/api/bin/dsmtca":
ensure => file,
owner => "root", group => "bin", mode => 0755,
require => Package["TIVsm-BA"]; # TIVsm-API required by TIVsm-BA
owner => 'root', group => 'bin', mode => 0755,
require => Package['TIVsm-BA']; # TIVsm-API required by TIVsm-BA
"${tsmclient::vars::tsmprefix}/client/api/bin64/dsmtca":
ensure => file,
owner => "root", group => "bin", mode => 0755,
require => Package["TIVsm-API64"];
owner => 'root', group => 'bin', mode => 0755,
require => Package['TIVsm-API64'];
}
}
......@@ -276,17 +276,17 @@ class tsmclient::dsmtca_nosuid
class tsmclient::tsmbackup_cleanup
{
package {
"tsmbackup":
'tsmbackup':
ensure => absent;
}
file {
"/etc/sysconfig/tsmbackup":
'/etc/sysconfig/tsmbackup':
ensure => absent;
"/etc/logrotate.d/tsmbackup":
'/etc/logrotate.d/tsmbackup':
ensure => absent;
}
service {
"tsmbackup":
'tsmbackup':
enable => false;
}
}
......@@ -298,7 +298,7 @@ class tsmclient::tsmbackup_cleanup
*/
class tsmclient::vars
{
$tsmprefix = "/opt/tivoli/tsm"
$tsmprefix = '/opt/tivoli/tsm'
$tsmdir = "${tsmprefix}/client/ba"
$tsmpassworddir = "${tsmdir}/password"
}
......@@ -313,33 +313,33 @@ class tsmclient::vars
class tsmclient::install
{
package {
[ "TIVsm-BA", "TIVsm-API64" ]:
[ 'TIVsm-BA', 'TIVsm-API64' ]:
ensure => installed;
}
file {
"/etc/init.d/dsmcad":
'/etc/init.d/dsmcad':
ensure => file,
owner => "root", group => "root", mode => 0555,
content => template("tsmclient/dsmcad-sysvinit.sh.erb"),
require => Package["TIVsm-BA"];
"/etc/logrotate.d/dsmcad":
owner => 'root', group => 'root', mode => 0555,
content => template('tsmclient/dsmcad-sysvinit.sh.erb'),
require => Package['TIVsm-BA'];
'/etc/logrotate.d/dsmcad':
ensure => file,
owner => "root", group => "root", mode => 0444,
content => template("tsmclient/logrotate.conf.erb"),
require => Package["TIVsm-BA"];
owner => 'root', group => 'root', mode => 0444,
content => template('tsmclient/logrotate.conf.erb'),
require => Package['TIVsm-BA'];
"/etc/sysconfig/dsmcad":
'/etc/sysconfig/dsmcad':
ensure => file,
content => "LC_ALL=en_US.ISO-8859-1; export LC_ALL; unset LANG\n",
owner => "root", group => "root", mode => 0644,
require => Package["TIVsm-BA"], notify => Service["dsmcad"];
owner => 'root', group => 'root', mode => 0644,
require => Package['TIVsm-BA'], notify => Service['dsmcad'];
}
service {
"dsmcad":
'dsmcad':
enable => true, ensure => $running,
hasstatus => true, hasrestart => true,
require => File["/etc/init.d/dsmcad"];
require => File['/etc/init.d/dsmcad'];
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment