Ori.livneh has submitted this change and it was merged.
Change subject: Specify 1minute rather than '1 minute' for cronolog period.
......................................................................
Specify 1minute rather than '1 minute' for cronolog period.
The apache running on labcontrol1001 can't parse the commandline
with a space in the arg.
Change-Id: I1f39c91b7b97bf40f67c89e4c4b449f1b13dd1e5
---
M modules/puppetmaster/templates/puppetmaster.erb
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/puppetmaster/templates/puppetmaster.erb
b/modules/puppetmaster/templates/puppetmaster.erb
index 65c1113..e0b2bd2 100644
--- a/modules/puppetmaster/templates/puppetmaster.erb
+++ b/modules/puppetmaster/templates/puppetmaster.erb
@@ -97,7 +97,7 @@
<%- end -%>
LogFormat "%h %l %u %{%Y-%m-%d %H:%M:%S}t \"%r\" %>s %O %D \"%{Referer}i\"
\"%{User-Agent}i\"" puppetmaster
- CustomLog "|/usr/bin/cronolog --once-only --period=\"1 minute\"
/var/log/apache2/puppetmaster.log" puppetmaster
+ CustomLog "|/usr/bin/cronolog --once-only --period=1minute
/var/log/apache2/puppetmaster.log" puppetmaster
</VirtualHost>
<%- end -%>
@@ -132,6 +132,6 @@
</Directory>
LogFormat "%h %l %u %{%Y-%m-%d %H:%M:%S}t \"%r\" %>s %O %D \"%{Referer}i\"
\"%{User-Agent}i\"" puppetmaster
- CustomLog "|/usr/bin/cronolog --once-only --period=\"1 minute\"
/var/log/apache2/puppetmaster-backend.log" puppetmaster
+ CustomLog "|/usr/bin/cronolog --once-only --period=1minute
/var/log/apache2/puppetmaster-backend.log" puppetmaster
</VirtualHost>
<%- end -%>
--
To view, visit https://gerrit.wikimedia.org/r/220476
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1f39c91b7b97bf40f67c89e4c4b449f1b13dd1e5
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
