Use consistent naming of components
Rename "pvcd" to "pvcnoded", and "pvc-api" to "pvcapid" so names for the daemons are fully consistent. Update the names of the configuration files as well to match this new formatting. References #79
This commit is contained in:
10
debian/pvc-daemon-api.install
vendored
10
debian/pvc-daemon-api.install
vendored
@ -1,6 +1,6 @@
|
||||
api-daemon/pvc-api.py usr/share/pvc
|
||||
api-daemon/pvc-api.sample.yaml etc/pvc
|
||||
api-daemon/api_lib usr/share/pvc
|
||||
api-daemon/pvc-api.service lib/systemd/system
|
||||
api-daemon/pvc-provisioner-worker.service lib/systemd/system
|
||||
api-daemon/pvcapid.py usr/share/pvc
|
||||
api-daemon/pvcapid.sample.yaml etc/pvc
|
||||
api-daemon/pvcapid usr/share/pvc
|
||||
api-daemon/pvcapid.service lib/systemd/system
|
||||
api-daemon/pvcapid-worker.service lib/systemd/system
|
||||
api-daemon/provisioner usr/share/pvc
|
||||
|
14
debian/pvc-daemon-api.postinst
vendored
14
debian/pvc-daemon-api.postinst
vendored
@ -1,20 +1,20 @@
|
||||
#!/bin/sh
|
||||
|
||||
# Install client binary to /usr/bin via symlink
|
||||
ln -s /usr/share/pvc/api.py /usr/bin/pvc-api
|
||||
ln -s /usr/share/pvc/api.py /usr/bin/pvcapid
|
||||
|
||||
# Reload systemd's view of the units
|
||||
systemctl daemon-reload
|
||||
|
||||
# Restart the main daemon (or warn on first install)
|
||||
if systemctl is-active --quiet pvc-api.service; then
|
||||
systemctl restart pvc-api.service
|
||||
if systemctl is-active --quiet pvcapid.service; then
|
||||
systemctl restart pvcapid.service
|
||||
else
|
||||
echo "NOTE: The PVC client API daemon (pvc-api.service) has not been started; create a config file at /etc/pvc/pvc-api.yaml then start it."
|
||||
echo "NOTE: The PVC client API daemon (pvcapid.service) has not been started; create a config file at /etc/pvc/pvcapid.yaml then start it."
|
||||
fi
|
||||
# Restart the worker daemon (or warn on first install)
|
||||
if systemctl is-active --quiet pvc-provisioner-worker.service; then
|
||||
systemctl restart pvc-provisioner-worker.service
|
||||
if systemctl is-active --quiet pvcapid-worker.service; then
|
||||
systemctl restart pvcapid-worker.service
|
||||
else
|
||||
echo "NOTE: The PVC provisioner worker daemon (pvc-provisioner-worker.service) has not been started; create a config file at /etc/pvc/pvc-api.yaml then start it."
|
||||
echo "NOTE: The PVC provisioner worker daemon (pvcapid-worker.service) has not been started; create a config file at /etc/pvc/pvcapid.yaml then start it."
|
||||
fi
|
||||
|
2
debian/pvc-daemon-api.prerm
vendored
2
debian/pvc-daemon-api.prerm
vendored
@ -1,4 +1,4 @@
|
||||
#!/bin/sh
|
||||
|
||||
# Remove client binary symlink
|
||||
rm -f /usr/bin/pvc-api
|
||||
rm -f /usr/bin/pvcapid
|
||||
|
10
debian/pvc-daemon-node.install
vendored
10
debian/pvc-daemon-node.install
vendored
@ -1,6 +1,6 @@
|
||||
node-daemon/pvcd.py usr/share/pvc
|
||||
node-daemon/pvcd.sample.yaml etc/pvc
|
||||
node-daemon/pvcd usr/share/pvc
|
||||
node-daemon/pvcd.target lib/systemd/system
|
||||
node-daemon/pvcd.service lib/systemd/system
|
||||
node-daemon/pvcnoded.py usr/share/pvc
|
||||
node-daemon/pvcnoded.sample.yaml etc/pvc
|
||||
node-daemon/pvcnoded usr/share/pvc
|
||||
node-daemon/pvcnoded.target lib/systemd/system
|
||||
node-daemon/pvcnoded.service lib/systemd/system
|
||||
node-daemon/pvc-flush.service lib/systemd/system
|
||||
|
10
debian/pvc-daemon-node.postinst
vendored
10
debian/pvc-daemon-node.postinst
vendored
@ -4,8 +4,8 @@
|
||||
systemctl daemon-reload
|
||||
|
||||
# Enable the service and target
|
||||
systemctl enable /lib/systemd/system/pvcd.service
|
||||
systemctl enable /lib/systemd/system/pvcd.target
|
||||
systemctl enable /lib/systemd/system/pvcnoded.service
|
||||
systemctl enable /lib/systemd/system/pvc.target
|
||||
|
||||
# Inform administrator of the autoflush daemon if it is not enabled
|
||||
if ! systemctl is-active --quiet pvc-flush.service; then
|
||||
@ -13,8 +13,8 @@ if ! systemctl is-active --quiet pvc-flush.service; then
|
||||
fi
|
||||
|
||||
# Inform administrator of the service restart/startup not occurring automatically
|
||||
if systemctl is-active --quiet pvcd.service; then
|
||||
echo "NOTE: The PVC node daemon (pvcd.service) has not been restarted; this is up to the administrator."
|
||||
if systemctl is-active --quiet pvcnoded.service; then
|
||||
echo "NOTE: The PVC node daemon (pvcnoded.service) has not been restarted; this is up to the administrator."
|
||||
else
|
||||
echo "NOTE: The PVC node daemon (pvcd.service) has not been started; create a config file at /etc/pvc/pvcd.yaml then start it."
|
||||
echo "NOTE: The PVC node daemon (pvcnoded.service) has not been started; create a config file at /etc/pvc/pvcnoded.yaml then start it."
|
||||
fi
|
||||
|
4
debian/pvc-daemon-node.prerm
vendored
4
debian/pvc-daemon-node.prerm
vendored
@ -1,5 +1,5 @@
|
||||
#!/bin/sh
|
||||
|
||||
# Disable the services
|
||||
systemctl disable pvcd.service
|
||||
systemctl disable pvcd.target
|
||||
systemctl disable pvcnoded.service
|
||||
systemctl disable pvc.target
|
||||
|
Reference in New Issue
Block a user