DESTDIR=
-SUBDIRS = aplinfo PVE bin www
+SUBDIRS = aplinfo PVE bin www services
ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
GITVERSION:=$(shell git rev-parse HEAD)
export PERLLIB=..
-SUBDIRS = init.d test
+SUBDIRS = test
SERVICES = pvestatd pveproxy pvedaemon spiceproxy
CLITOOLS = vzdump pvesubscription pveceph pveam pvesr pvenode
+++ /dev/null
-include ../../defines.mk
-
-all:
-
-SERVICES= \
- pvebanner.service \
- pvenetcommit.service \
- pvestatd.service \
- pve-guests.service \
- pvedaemon.service \
- pveproxy.service \
- spiceproxy.service \
- pve-storage.target \
- pve-daily-update.service\
- pve-daily-update.timer \
- pvesr.service \
- pvesr.timer
-
-.PHONY: install
-install: ${SERVICES}
- install -d ${SERVICEDIR}
- install -m 0644 ${SERVICES} ${SERVICEDIR}
- install -d ${SERVICEDIR}/ceph-mon@.service.d
- install -m 0644 ceph-after-pve-cluster.conf ${SERVICEDIR}/ceph-mon@.service.d
- install -d ${SERVICEDIR}/ceph-mgr@.service.d
- install -m 0644 ceph-after-pve-cluster.conf ${SERVICEDIR}/ceph-mgr@.service.d
- install -d ${SERVICEDIR}/ceph-osd@.service.d
- install -m 0644 ceph-after-pve-cluster.conf ${SERVICEDIR}/ceph-osd@.service.d
- install -d ${SERVICEDIR}/ceph-disk@.service.d
- install -m 0644 ceph-after-pve-cluster.conf ${SERVICEDIR}/ceph-disk@.service.d
- install -d ${SERVICEDIR}/ceph-mds@.service.d
- install -m 0644 ceph-after-pve-cluster.conf ${SERVICEDIR}/ceph-mds@.service.d
- install -d ${DESTDIR}/usr/share/doc/${PACKAGE}/examples/
- install -m 0644 ceph.service ${DESTDIR}/usr/share/doc/${PACKAGE}/examples/ceph.service
-
-.PHONY: clean
-clean:
- rm -rf *~
+++ /dev/null
-[Unit]
-After=pve-cluster.service
+++ /dev/null
-[Unit]
-Description=PVE activate Ceph OSD disks
-After=pve-cluster.service
-Requires=pve-cluster.service
-
-[Service]
-ExecStart=/usr/sbin/ceph-disk --log-stdout activate-all
-Type=oneshot
-
-[Install]
-WantedBy=multi-user.target
+++ /dev/null
-[Unit]
-Description=Daily PVE download activities
-After=network-online.target
-Wants=network-online.target
-Wants=pve-cluster.service
-After=pve-cluster.service
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/pveupdate
+++ /dev/null
-[Unit]
-Description=Daily PVE download activities
-
-[Timer]
-OnCalendar=*-*-* 2:00
-RandomizedDelaySec=4h
-Persistent=true
-
-[Install]
-WantedBy=timers.target
+++ /dev/null
-[Unit]
-Description=PVE guests
-ConditionPathExists=/usr/bin/pvesh
-RefuseManualStart=true
-RefuseManualStop=true
-Wants=pvestatd.service
-Wants=pveproxy.service
-Wants=spiceproxy.service
-Wants=pve-firewall.service
-Wants=lxc.service
-After=pveproxy.service
-After=pvestatd.service
-After=spiceproxy.service
-After=pve-firewall.service
-After=lxc.service
-After=pve-ha-crm.service pve-ha-lrm.service
-
-[Service]
-Environment="PVE_LOG_ID=pve-guests"
-ExecStart=/usr/bin/pvesh --nooutput create /nodes/localhost/startall
-ExecStop=-/usr/bin/vzdump -stop
-ExecStop=/usr/bin/pvesh --nooutput create /nodes/localhost/stopall
-Type=oneshot
-RemainAfterExit=yes
-TimeoutSec=infinity
-
-[Install]
-WantedBy=multi-user.target
-Alias=pve-manager.service
+++ /dev/null
-[Unit]
-Description=PVE Storage Target
-Wants=remote-fs.target
-After=remote-fs.target
-After=ceph.service
-After=ceph-mon.target
-After=ceph-osd.target
-After=ceph-mds.target
-After=ceph-mgr.target
-After=sheepdog.service
-After=glusterd.service
-After=open-iscsi.service
+++ /dev/null
-[Unit]
-Description=Proxmox VE Login Banner
-ConditionPathExists=/usr/bin/pvebanner
-DefaultDependencies=no
-After=local-fs.target
-Before=console-getty.service
-
-[Service]
-ExecStart=/usr/bin/pvebanner
-Type=oneshot
-RemainAfterExit=yes
-
-[Install]
-WantedBy=getty.target
+++ /dev/null
-[Unit]
-Description=PVE API Daemon
-ConditionPathExists=/usr/bin/pvedaemon
-Wants=corosync.service pve-cluster.service
-After=corosync.service pve-cluster.service
-
-[Service]
-ExecStart=/usr/bin/pvedaemon start
-ExecStop=/usr/bin/pvedaemon stop
-ExecReload=/usr/bin/pvedaemon restart
-PIDFile=/var/run/pvedaemon.pid
-Type=forking
-
-[Install]
-WantedBy=multi-user.target
+++ /dev/null
-#!/bin/sh
-
-### BEGIN INIT INFO
-# Provides: pvenetcommit
-# Required-Start: checkroot
-# Required-Stop:
-# Default-Start: S
-# Default-Stop:
-# Short-Description: commits network changes
-### END INIT INFO
-
-set -e
-
-. /lib/lsb/init-functions
-
-PATH=/sbin:/bin
-
-IFFN=/etc/network/interfaces
-
-# we cant use perl here, because this skript runs before
-# we have /usr mounted
-
-case "$1" in
- start)
- # remove OVS config
- rm -f /etc/openvswitch/conf.db
-
- if test -f "${IFFN}.new"; then
- echo "committing new network configuration";
- if ! mv "${IFFN}.new" $IFFN; then
- echo "unable to commit changes to '${IFFN}' - $!\n";
- fi
- fi
- ;;
- stop|restart|force-reload)
- exit 0
- ;;
- *)
- echo "Usage: /etc/init.d/pvenetcommit {start}"
- exit 0
- ;;
-esac
-
-exit 0
+++ /dev/null
-[Unit]
-Description=Commit Proxmox VE network changes
-DefaultDependencies=no
-After=local-fs.target
-Before=sysinit.target
-
-[Service]
-ExecStartPre=-/bin/rm -f /etc/openvswitch/conf.db
-ExecStartPre=-/bin/mv /etc/network/interfaces.new /etc/network/interfaces
-ExecStart=/bin/true
-Type=oneshot
-RemainAfterExit=yes
-
-
-[Install]
-WantedBy=sysinit.target
-
+++ /dev/null
-[Unit]
-Description=PVE API Proxy Server
-ConditionPathExists=/usr/bin/pveproxy
-Wants=pve-cluster.service
-Wants=pvedaemon.service
-Wants=ssh.service
-Wants=pve-storage.target
-After=pve-storage.target
-After=pve-cluster.service
-After=pvedaemon.service
-After=ssh.service
-
-[Service]
-ExecStart=/usr/bin/pveproxy start
-ExecStop=/usr/bin/pveproxy stop
-ExecReload=/usr/bin/pveproxy restart
-PIDFile=/var/run/pveproxy/pveproxy.pid
-Type=forking
-
-[Install]
-WantedBy=multi-user.target
+++ /dev/null
-[Unit]
-Description=Proxmox VE replication runner
-ConditionPathExists=/usr/bin/pvesr
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/pvesr run --mail 1
+++ /dev/null
-[Unit]
-Description=Proxmox VE replication runner
-
-[Timer]
-AccuracySec=1
-RemainAfterElapse=no
-
-[Timer]
-OnCalendar=minutely
-
-[Install]
-WantedBy=timers.target
\ No newline at end of file
+++ /dev/null
-[Unit]
-Description=PVE Status Daemon
-ConditionPathExists=/usr/bin/pvestatd
-Wants=pve-cluster.service
-After=pve-cluster.service
-
-[Service]
-ExecStart=/usr/bin/pvestatd start
-ExecStop=/usr/bin/pvestatd stop
-ExecReload=/usr/bin/pvestatd restart
-PIDFile=/var/run/pvestatd.pid
-Type=forking
-
-[Install]
-WantedBy=multi-user.target
+++ /dev/null
-[Unit]
-Description=PVE SPICE Proxy Server
-ConditionPathExists=/usr/bin/spiceproxy
-Wants=pveproxy.service
-After=pveproxy.service
-
-[Service]
-ExecStart=/usr/bin/spiceproxy start
-ExecStop=/usr/bin/spiceproxy stop
-ExecReload=/usr/bin/spiceproxy restart
-PIDFile=/var/run/pveproxy/spiceproxy.pid
-Type=forking
-
-[Install]
-WantedBy=multi-user.target
--- /dev/null
+include ../defines.mk
+
+all:
+
+SERVICES= \
+ pvebanner.service \
+ pvenetcommit.service \
+ pvestatd.service \
+ pve-guests.service \
+ pvedaemon.service \
+ pveproxy.service \
+ spiceproxy.service \
+ pve-storage.target \
+ pve-daily-update.service\
+ pve-daily-update.timer \
+ pvesr.service \
+ pvesr.timer
+
+.PHONY: install
+install: ${SERVICES}
+ install -d ${SERVICEDIR}
+ install -m 0644 ${SERVICES} ${SERVICEDIR}
+ install -d ${SERVICEDIR}/ceph-mon@.service.d
+ install -m 0644 ceph-after-pve-cluster.conf ${SERVICEDIR}/ceph-mon@.service.d
+ install -d ${SERVICEDIR}/ceph-mgr@.service.d
+ install -m 0644 ceph-after-pve-cluster.conf ${SERVICEDIR}/ceph-mgr@.service.d
+ install -d ${SERVICEDIR}/ceph-osd@.service.d
+ install -m 0644 ceph-after-pve-cluster.conf ${SERVICEDIR}/ceph-osd@.service.d
+ install -d ${SERVICEDIR}/ceph-disk@.service.d
+ install -m 0644 ceph-after-pve-cluster.conf ${SERVICEDIR}/ceph-disk@.service.d
+ install -d ${SERVICEDIR}/ceph-mds@.service.d
+ install -m 0644 ceph-after-pve-cluster.conf ${SERVICEDIR}/ceph-mds@.service.d
+ install -d ${DESTDIR}/usr/share/doc/${PACKAGE}/examples/
+ install -m 0644 ceph.service ${DESTDIR}/usr/share/doc/${PACKAGE}/examples/ceph.service
+
+.PHONY: clean
+clean:
+ rm -rf *~
--- /dev/null
+[Unit]
+After=pve-cluster.service
--- /dev/null
+[Unit]
+Description=PVE activate Ceph OSD disks
+After=pve-cluster.service
+Requires=pve-cluster.service
+
+[Service]
+ExecStart=/usr/sbin/ceph-disk --log-stdout activate-all
+Type=oneshot
+
+[Install]
+WantedBy=multi-user.target
--- /dev/null
+[Unit]
+Description=Daily PVE download activities
+After=network-online.target
+Wants=network-online.target
+Wants=pve-cluster.service
+After=pve-cluster.service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/pveupdate
--- /dev/null
+[Unit]
+Description=Daily PVE download activities
+
+[Timer]
+OnCalendar=*-*-* 2:00
+RandomizedDelaySec=4h
+Persistent=true
+
+[Install]
+WantedBy=timers.target
--- /dev/null
+[Unit]
+Description=PVE guests
+ConditionPathExists=/usr/bin/pvesh
+RefuseManualStart=true
+RefuseManualStop=true
+Wants=pvestatd.service
+Wants=pveproxy.service
+Wants=spiceproxy.service
+Wants=pve-firewall.service
+Wants=lxc.service
+After=pveproxy.service
+After=pvestatd.service
+After=spiceproxy.service
+After=pve-firewall.service
+After=lxc.service
+After=pve-ha-crm.service pve-ha-lrm.service
+
+[Service]
+Environment="PVE_LOG_ID=pve-guests"
+ExecStart=/usr/bin/pvesh --nooutput create /nodes/localhost/startall
+ExecStop=-/usr/bin/vzdump -stop
+ExecStop=/usr/bin/pvesh --nooutput create /nodes/localhost/stopall
+Type=oneshot
+RemainAfterExit=yes
+TimeoutSec=infinity
+
+[Install]
+WantedBy=multi-user.target
+Alias=pve-manager.service
--- /dev/null
+[Unit]
+Description=PVE Storage Target
+Wants=remote-fs.target
+After=remote-fs.target
+After=ceph.service
+After=ceph-mon.target
+After=ceph-osd.target
+After=ceph-mds.target
+After=ceph-mgr.target
+After=sheepdog.service
+After=glusterd.service
+After=open-iscsi.service
--- /dev/null
+[Unit]
+Description=Proxmox VE Login Banner
+ConditionPathExists=/usr/bin/pvebanner
+DefaultDependencies=no
+After=local-fs.target
+Before=console-getty.service
+
+[Service]
+ExecStart=/usr/bin/pvebanner
+Type=oneshot
+RemainAfterExit=yes
+
+[Install]
+WantedBy=getty.target
--- /dev/null
+[Unit]
+Description=PVE API Daemon
+ConditionPathExists=/usr/bin/pvedaemon
+Wants=corosync.service pve-cluster.service
+After=corosync.service pve-cluster.service
+
+[Service]
+ExecStart=/usr/bin/pvedaemon start
+ExecStop=/usr/bin/pvedaemon stop
+ExecReload=/usr/bin/pvedaemon restart
+PIDFile=/var/run/pvedaemon.pid
+Type=forking
+
+[Install]
+WantedBy=multi-user.target
--- /dev/null
+#!/bin/sh
+
+### BEGIN INIT INFO
+# Provides: pvenetcommit
+# Required-Start: checkroot
+# Required-Stop:
+# Default-Start: S
+# Default-Stop:
+# Short-Description: commits network changes
+### END INIT INFO
+
+set -e
+
+. /lib/lsb/init-functions
+
+PATH=/sbin:/bin
+
+IFFN=/etc/network/interfaces
+
+# we cant use perl here, because this skript runs before
+# we have /usr mounted
+
+case "$1" in
+ start)
+ # remove OVS config
+ rm -f /etc/openvswitch/conf.db
+
+ if test -f "${IFFN}.new"; then
+ echo "committing new network configuration";
+ if ! mv "${IFFN}.new" $IFFN; then
+ echo "unable to commit changes to '${IFFN}' - $!\n";
+ fi
+ fi
+ ;;
+ stop|restart|force-reload)
+ exit 0
+ ;;
+ *)
+ echo "Usage: /etc/init.d/pvenetcommit {start}"
+ exit 0
+ ;;
+esac
+
+exit 0
--- /dev/null
+[Unit]
+Description=Commit Proxmox VE network changes
+DefaultDependencies=no
+After=local-fs.target
+Before=sysinit.target
+
+[Service]
+ExecStartPre=-/bin/rm -f /etc/openvswitch/conf.db
+ExecStartPre=-/bin/mv /etc/network/interfaces.new /etc/network/interfaces
+ExecStart=/bin/true
+Type=oneshot
+RemainAfterExit=yes
+
+
+[Install]
+WantedBy=sysinit.target
+
--- /dev/null
+[Unit]
+Description=PVE API Proxy Server
+ConditionPathExists=/usr/bin/pveproxy
+Wants=pve-cluster.service
+Wants=pvedaemon.service
+Wants=ssh.service
+Wants=pve-storage.target
+After=pve-storage.target
+After=pve-cluster.service
+After=pvedaemon.service
+After=ssh.service
+
+[Service]
+ExecStart=/usr/bin/pveproxy start
+ExecStop=/usr/bin/pveproxy stop
+ExecReload=/usr/bin/pveproxy restart
+PIDFile=/var/run/pveproxy/pveproxy.pid
+Type=forking
+
+[Install]
+WantedBy=multi-user.target
--- /dev/null
+[Unit]
+Description=Proxmox VE replication runner
+ConditionPathExists=/usr/bin/pvesr
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/pvesr run --mail 1
--- /dev/null
+[Unit]
+Description=Proxmox VE replication runner
+
+[Timer]
+AccuracySec=1
+RemainAfterElapse=no
+
+[Timer]
+OnCalendar=minutely
+
+[Install]
+WantedBy=timers.target
\ No newline at end of file
--- /dev/null
+[Unit]
+Description=PVE Status Daemon
+ConditionPathExists=/usr/bin/pvestatd
+Wants=pve-cluster.service
+After=pve-cluster.service
+
+[Service]
+ExecStart=/usr/bin/pvestatd start
+ExecStop=/usr/bin/pvestatd stop
+ExecReload=/usr/bin/pvestatd restart
+PIDFile=/var/run/pvestatd.pid
+Type=forking
+
+[Install]
+WantedBy=multi-user.target
--- /dev/null
+[Unit]
+Description=PVE SPICE Proxy Server
+ConditionPathExists=/usr/bin/spiceproxy
+Wants=pveproxy.service
+After=pveproxy.service
+
+[Service]
+ExecStart=/usr/bin/spiceproxy start
+ExecStop=/usr/bin/spiceproxy stop
+ExecReload=/usr/bin/spiceproxy restart
+PIDFile=/var/run/pveproxy/spiceproxy.pid
+Type=forking
+
+[Install]
+WantedBy=multi-user.target