From 361555abbfd346bae09470eb23bdcb753fb26893 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Mon, 3 Feb 2014 17:22:10 +0800 Subject: [PATCH] Renames notification-agent -> agent-notification Change-Id: Ie043d24a0f67f8288b4ffa58123882364854b268 Rewritten-From: 21d443d65f603e5af3ca462c8ba251427e7959e1 --- ...ent.init => ceilometer-agent-notification.init} | 8 ++++---- .../debian/ceilometer-agent-notification.install | 1 + .../debian/ceilometer-agent-notification.logrotate | 14 ++++++++++++++ ...postrm => ceilometer-agent-notification.postrm} | 2 +- ...in => ceilometer-agent-notification.upstart.in} | 4 ++-- .../debian/ceilometer-notification-agent.install | 1 - .../debian/ceilometer-notification-agent.logrotate | 14 -------------- xenial/debian/control | 2 +- 8 files changed, 23 insertions(+), 23 deletions(-) rename xenial/debian/{ceilometer-notification-agent.init => ceilometer-agent-notification.init} (92%) create mode 100644 xenial/debian/ceilometer-agent-notification.install create mode 100644 xenial/debian/ceilometer-agent-notification.logrotate rename xenial/debian/{ceilometer-notification-agent.postrm => ceilometer-agent-notification.postrm} (71%) rename xenial/debian/{ceilometer-notification-agent.upstart.in => ceilometer-agent-notification.upstart.in} (69%) delete mode 100644 xenial/debian/ceilometer-notification-agent.install delete mode 100644 xenial/debian/ceilometer-notification-agent.logrotate diff --git a/xenial/debian/ceilometer-notification-agent.init b/xenial/debian/ceilometer-agent-notification.init similarity index 92% rename from xenial/debian/ceilometer-notification-agent.init rename to xenial/debian/ceilometer-agent-notification.init index c7d234f..88cb7f1 100644 --- a/xenial/debian/ceilometer-notification-agent.init +++ b/xenial/debian/ceilometer-agent-notification.init @@ -1,14 +1,14 @@ #!/bin/sh ### BEGIN INIT INFO -# Provides: ceilometer-notification-agent +# Provides: ceilometer-agent-notification # Required-Start: $network $local_fs $remote_fs $syslog # Required-Stop: $remote_fs # Should-Start: mongodb rabbitmq-server # Should-Stop: mongodb rabbitmq-server # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 -# Short-Description: ceilometer notification agent -# Description: ceilometer notification agent +# Short-Description: ceilometer agent notification +# Description: ceilometer agent notification ### END INIT INFO # Author: Thomas Goirand @@ -16,7 +16,7 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin DESC="Ceilometer Notification Agent" SYS_NAME=ceilometer -NAME=ceilometer-notification-agent +NAME=ceilometer-agent-notification DAEMON=/usr/bin/${NAME} SCRIPTNAME=/etc/init.d/${NAME} diff --git a/xenial/debian/ceilometer-agent-notification.install b/xenial/debian/ceilometer-agent-notification.install new file mode 100644 index 0000000..cd893de --- /dev/null +++ b/xenial/debian/ceilometer-agent-notification.install @@ -0,0 +1 @@ +/usr/bin/ceilometer-agent-notification diff --git a/xenial/debian/ceilometer-agent-notification.logrotate b/xenial/debian/ceilometer-agent-notification.logrotate new file mode 100644 index 0000000..ae7c06b --- /dev/null +++ b/xenial/debian/ceilometer-agent-notification.logrotate @@ -0,0 +1,14 @@ +/var/log/ceilometer/ceilometer-agent-notification.log { + daily + missingok + compress + delaycompress + notifempty + postrotate + if dpkg-vendor --derives-from ubuntu ; then + service ceilometer-agent-notification restart >/dev/null 2>&1 || true + else + invoke-rc.d ceilometer-agent-notification restart >/dev/null 2>&1 || true + fi + endscript +} diff --git a/xenial/debian/ceilometer-notification-agent.postrm b/xenial/debian/ceilometer-agent-notification.postrm similarity index 71% rename from xenial/debian/ceilometer-notification-agent.postrm rename to xenial/debian/ceilometer-agent-notification.postrm index 6186c8f..850a970 100644 --- a/xenial/debian/ceilometer-notification-agent.postrm +++ b/xenial/debian/ceilometer-agent-notification.postrm @@ -3,7 +3,7 @@ set -e if [ "${1}" = purge ] ; then - rm -f /var/log/ceilometer/ceilometer-notification-agent.log* + rm -f /var/log/ceilometer/ceilometer-agent-notification.log* [ -d /var/log/ceilometer ] && rmdir --ignore-fail-on-non-empty /var/log/ceilometer fi diff --git a/xenial/debian/ceilometer-notification-agent.upstart.in b/xenial/debian/ceilometer-agent-notification.upstart.in similarity index 69% rename from xenial/debian/ceilometer-notification-agent.upstart.in rename to xenial/debian/ceilometer-agent-notification.upstart.in index a384044..22793c6 100644 --- a/xenial/debian/ceilometer-notification-agent.upstart.in +++ b/xenial/debian/ceilometer-agent-notification.upstart.in @@ -1,4 +1,4 @@ -description "ceilometer-agent-compute" +description "ceilometer-agent-notification" author "Thomas Goirand " start on runlevel [2345] @@ -14,4 +14,4 @@ pre-start script chown ceilometer:ceilometer /var/lock/ceilometer end script -exec su -s /bin/sh -c "exec ceilometer-notification-agent --config-file /etc/ceilometer/ceilometer.conf --log-file /var/log/ceilometer/ceilometer-notification-agent.log" ceilometer +exec su -s /bin/sh -c "exec ceilometer-agent-notification --config-file /etc/ceilometer/ceilometer.conf --log-file /var/log/ceilometer/ceilometer-agent-notification.log" ceilometer diff --git a/xenial/debian/ceilometer-notification-agent.install b/xenial/debian/ceilometer-notification-agent.install deleted file mode 100644 index e01c4b2..0000000 --- a/xenial/debian/ceilometer-notification-agent.install +++ /dev/null @@ -1 +0,0 @@ -/usr/bin/ceilometer-notification-agent diff --git a/xenial/debian/ceilometer-notification-agent.logrotate b/xenial/debian/ceilometer-notification-agent.logrotate deleted file mode 100644 index 7390c6a..0000000 --- a/xenial/debian/ceilometer-notification-agent.logrotate +++ /dev/null @@ -1,14 +0,0 @@ -/var/log/ceilometer/ceilometer-notification-agent.log { - daily - missingok - compress - delaycompress - notifempty - postrotate - if dpkg-vendor --derives-from ubuntu ; then \ - service ceilometer-notification-agent restart >/dev/null 2>&1 || true ; \ - else \ - invoke-rc.d ceilometer-notification-agent restart >/dev/null 2>&1 || true ; \ - fi - endscript -} diff --git a/xenial/debian/control b/xenial/debian/control index 7d0eecf..40baf3e 100644 --- a/xenial/debian/control +++ b/xenial/debian/control @@ -243,7 +243,7 @@ Description: OpenStack efficient metering counters system - alarm notifier . This package contains the alarm notifier daemon. -Package: ceilometer-notification-agent +Package: ceilometer-agent-notification Architecture: all Pre-Depends: dpkg (>= 1.15.6~) Depends: ceilometer-common (= ${binary:Version}), -- 2.32.3