Elukey has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/362356 )
Change subject: Revert "Revert "Remove logrotate and syslog configuration"" ...................................................................... Revert "Revert "Remove logrotate and syslog configuration"" The master branch is apparently the one tracking the last debian changes, we don't really need a separate (confusing) branch other than master. This reverts commit e381b6400711426711400cb24b158cbf0fc5d658. Change-Id: I32bd2b991c12d27a78bf362644c643a37240ec84 --- D debian/75-kafkatee.conf M debian/kafkatee.install D debian/kafkatee.logrotate M debian/kafkatee.postinst 4 files changed, 0 insertions(+), 29 deletions(-) Approvals: Elukey: Verified; Looks good to me, approved diff --git a/debian/75-kafkatee.conf b/debian/75-kafkatee.conf deleted file mode 100644 index d9c29ce..0000000 --- a/debian/75-kafkatee.conf +++ /dev/null @@ -1,2 +0,0 @@ -# rsyslogd kafkatee config. -if $programname == 'kafkatee' then /var/log/kafkatee.log diff --git a/debian/kafkatee.install b/debian/kafkatee.install index ef17cfb..eb3166b 100644 --- a/debian/kafkatee.install +++ b/debian/kafkatee.install @@ -1,4 +1,3 @@ kafkatee usr/bin debian/etc/kafkatee.conf etc debian/etc/kafkatee.d/README etc/kafkatee.d -debian/75-kafkatee.conf etc/rsyslog.d diff --git a/debian/kafkatee.logrotate b/debian/kafkatee.logrotate deleted file mode 100644 index 3e284d7..0000000 --- a/debian/kafkatee.logrotate +++ /dev/null @@ -1,23 +0,0 @@ -/var/log/kafkatee.log { - daily - rotate 7 - create 0664 syslog adm - missingok - compress - delaycompress - postrotate - service rsyslog reload - endscript -} - -/var/cache/kafkatee/kafkatee.stats.json { - weekly - rotate 4 - create 0644 kafkatee root - missingok - compress - delaycompress - postrotate - service kafkatee reload - endscript -} diff --git a/debian/kafkatee.postinst b/debian/kafkatee.postinst index 4900121..1b3033d 100755 --- a/debian/kafkatee.postinst +++ b/debian/kafkatee.postinst @@ -24,9 +24,6 @@ chown -R kafkatee:kafkatee /var/cache/kafkatee chown -R kafkatee:kafkatee /var/run/kafkatee - # force rsyslog to create /var/log/kafkatee.log on install. - service rsyslog restart - echo \ "NOTE: Default kafkatee config files have been installed at: /etc/kafkatee.conf -- To view, visit https://gerrit.wikimedia.org/r/362356 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I32bd2b991c12d27a78bf362644c643a37240ec84 Gerrit-PatchSet: 1 Gerrit-Project: analytics/kafkatee Gerrit-Branch: master Gerrit-Owner: Elukey <ltosc...@wikimedia.org> Gerrit-Reviewer: Elukey <ltosc...@wikimedia.org> Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org> Gerrit-Reviewer: Ottomata <ao...@wikimedia.org> Gerrit-Reviewer: Volans <rcocci...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits