This is an automated email from the ASF dual-hosted git repository.
bhaisaab pushed a commit to branch 4.9
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.9 by this push:
new 974e01e CLOUDSTACK-10011: Fix Agent logrotation (#2094)
974e01e is described below
commit 974e01ed088524a03b8de1d578f029a1b4c7e9f9
Author: Ronald van Zantvoort <[email protected]>
AuthorDate: Thu Aug 3 00:29:02 2017 +0200
CLOUDSTACK-10011: Fix Agent logrotation (#2094)
* CS Agent: Correct logrotation for agent log
* CS Agent: Logrotate security_group as well
* CS Agent: fix logrotation file perms so logrotate doesnt skip it
---
agent/conf/cloudstack-agent.logrotate | 4 ++--
debian/rules | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/agent/conf/cloudstack-agent.logrotate
b/agent/conf/cloudstack-agent.logrotate
index 202de8f..6733af5 100644
--- a/agent/conf/cloudstack-agent.logrotate
+++ b/agent/conf/cloudstack-agent.logrotate
@@ -15,8 +15,8 @@
# specific language governing permissions and limitations
# under the License.
-/var/log/cloudstack/agent/cloudstack-agent.out
-/var/log/cloudstack/agent/cloudstack-agent.err
+@AGENTLOG@
+/var/log/cloudstack/agent/security_group.log
{
copytruncate
daily
diff --git a/debian/rules b/debian/rules
index cfe7514..8983c97 100755
--- a/debian/rules
+++ b/debian/rules
@@ -51,10 +51,11 @@ override_dh_auto_install:
install -m0644 packaging/systemd/$(PACKAGE)-agent.service
debian/$(PACKAGE)-agent/lib/systemd/system/$(PACKAGE)-agent.service
install -m0644 packaging/systemd/$(PACKAGE)-agent.default
$(DESTDIR)/$(SYSCONFDIR)/default/$(PACKAGE)-agent
+ install -D -m0644 agent/target/transformed/cloudstack-agent.logrotate
$(DESTDIR)/$(SYSCONFDIR)/logrotate.d/cloudstack-agent
+
install -D agent/target/transformed/cloud-setup-agent
$(DESTDIR)/usr/bin/cloudstack-setup-agent
install -D agent/target/transformed/cloud-ssh
$(DESTDIR)/usr/bin/cloudstack-ssh
install -D agent/target/transformed/cloudstack-agent-profile.sh
$(DESTDIR)/$(SYSCONFDIR)/profile.d/cloudstack-agent-profile.sh
- install -D agent/target/transformed/cloudstack-agent.logrotate
$(DESTDIR)/$(SYSCONFDIR)/logrotate.d/cloudstack-agent
install -D agent/target/transformed/cloudstack-agent-upgrade
$(DESTDIR)/usr/bin/cloudstack-agent-upgrade
install -D agent/target/transformed/libvirtqemuhook
$(DESTDIR)/usr/share/$(PACKAGE)-agent/lib/
install -D agent/target/transformed/*
$(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/agent
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].