summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Stanley <fungi@yuggoth.org>2015-10-13 18:01:09 +0000
committerJeremy Stanley <fungi@yuggoth.org>2015-10-14 13:29:17 +0000
commit0dcb175c42f0b6ff61c3438cbae5f0b7fd87eea6 (patch)
treeccc846851322857e1f7059555fb91e2516557f81
parenta827227079d380def59e6c93255eeb0cf77ffd12 (diff)
Clean up doubled backslashes in logrotate config
According to https://docs.puppetlabs.com/puppet/3.8/reference/lang_datatypes.html there is no way to end a single-quoted string with a literal backslash, so fold this content into the preceding double-quoted string in an effort to satisfy the linter as well. Change-Id: Ic639cd2fc1c7953cbf4311ce7c958f9bdb61e31b
Notes
Notes (review): Verified+2: Jenkins Code-Review+2: yolanda.robla <info@ysoft.biz> Code-Review+2: Spencer Krum <nibz@spencerkrum.com> Workflow+1: Spencer Krum <nibz@spencerkrum.com> Submitted-by: Jenkins Submitted-at: Wed, 14 Oct 2015 19:44:36 +0000 Reviewed-on: https://review.openstack.org/234373 Project: openstack-infra/puppet-httpd Branch: refs/heads/master
-rw-r--r--manifests/logrotate.pp8
1 files changed, 3 insertions, 5 deletions
diff --git a/manifests/logrotate.pp b/manifests/logrotate.pp
index c9bad6d..7418782 100644
--- a/manifests/logrotate.pp
+++ b/manifests/logrotate.pp
@@ -12,13 +12,11 @@ class httpd::logrotate (
12 ], 12 ],
13 $prerotate = [ 13 $prerotate = [
14 "if [ -d /etc/logrotate.d/${::httpd::params::apache_name}-prerotate ]; then \\", 14 "if [ -d /etc/logrotate.d/${::httpd::params::apache_name}-prerotate ]; then \\",
15 " run-parts /etc/logrotate.d/${::httpd::params::apache_name}-prerotate; \\", 15 " run-parts /etc/logrotate.d/${::httpd::params::apache_name}-prerotate; fi ; \\",
16 'fi; \\',
17 ], 16 ],
18 $postrotate = [ 17 $postrotate = [
19 "if service ${::httpd::params::apache_name} status > /dev/null ; then \\", 18 "if service ${::httpd::params::apache_name} status > /dev/null; then \\",
20 " service ${::httpd::params::apache_name} reload > /dev/null; \\", 19 " service ${::httpd::params::apache_name} reload > /dev/null; fi; \\",
21 'fi; \\',
22 ], 20 ],
23 $firstaction = 'undef', 21 $firstaction = 'undef',
24 $lastaction = 'undef', 22 $lastaction = 'undef',