Service units are now a lot closer to upstream

Logrotate and tmpfiles taken over from upstream

13 files changed, 157 insertions, 55 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 574735c36fd8..96a9dd343412 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = opennebula
 	pkgdesc = Virtual management infrastructure as a service (IaaS) toolkit for cloud computing (NOTE: Read the PKGBUILD!)
 	pkgver = 5.4.0
-	pkgrel = 2
+	pkgrel = 3
 	url = http://docs.opennebula.org/stable
 	install = opennebula.install
 	changelog = ChangeLog
@@ -82,25 +82,33 @@ pkgbase = opennebula
 	backup = etc/one/ec2_driver.default
 	source = http://downloads.opennebula.org/packages/opennebula-5.4.0/opennebula-5.4.0.tar.gz
 	source = opennebula.service
+	source = opennebula-scheduler.service
 	source = opennebula-sunstone.service
 	source = opennebula-econe.service
 	source = opennebula-oneflow.service
 	source = opennebula-onegate.service
+	source = opennebula-novnc.service
+	source = opennebula.conf
+	source = opennebula.logrotate
 	source = chown_fix.patch
 	source = set_locations.patch
 	source = fix_kvm_emulator.patch
 	source = vip.sh.patch
 	source = opennebula.install
 	sha512sums = 4d7d4f6c20a6185539a88006e4d15681d90cee45506d36017a538415a3b3cce809f02ff248013f9e2daa5f1d20afd308a0a014853b8462723ad6ba5acaa84626
-	sha512sums = d86b01dd0b0718e1f2c75ffa1220a621ce4953d2cb722defef51c9cb0ec7b3f7709c7cd760c87da9ecb16468ffed2eb7ecb40295f0d24f275648758784ecb745
-	sha512sums = 165232dfcae58a19dac689cf11c3b49ec0dea5c98835f7ced2c3cc32819204ffd16b90ac67e421730339613cc306577cebfe305d19ed5ea5edbfca70785f52f5
-	sha512sums = f3b9bad7c234010b3aab20df17a4c2ab74242e2305acc2cdfa3e36130674c8804aa5c89bdd8ca952d3d188541570da9841fa308d6f5e8dfc9c433628c7628898
-	sha512sums = a8e9c781f575d57ba8badb4491ffb4ed1dd5b2b5b7434735974516f2a1533aca5b64a898759b861ca0aff72fe1c629547d8dcbbc29ad45429d3e29f4e7a01160
-	sha512sums = 0fcfa0990623f6df0d48f24d1bcbc7482e589a454f33e47b4832633f064475d69f1784d87588d66e6d8b37ee448ab64e9a73442c56fcdd3eca66e4b487ea7b84
+	sha512sums = 0b139d219d9797231d55b3f1f0c5a0b94df46d7feda2853844c774b791ec788d2c093bfd4d3714ba41ab6ec3286b9fa3e7ae8126830020fe3c4422d7a15811e3
+	sha512sums = b1a361cabc5b49ec8cbe497d8a6f205ed222dadda70ec33f922050b8bdf86b1e52c7098d732b752493ce3626c043f6b482f33dd380f0ebaaf2f53415f58cb75d
+	sha512sums = 9e6c1017a58e5d53529342c55b241c4d2dac1470fc163e4e8c4e69fe42da4d2d8a58dafdf5ab2adb30ac1d8cdc79d73f7b66392855a8f4ce1fa7e7da65554ac7
+	sha512sums = 62e8a3640df5e4a9619cbd24dddaa273103fe0b4af5edd6947442c213dbff34993868f091662ce42c0c7b1398a3407bf62c0a57b5cf8f88f0d50f0270040c0e3
+	sha512sums = 302b677ef3ce17fafd1ab79926acf91729695f6eeec1dc0cc0169c140d3b69caecd5fbe349c54e5e2c4e33f5d83de40b7d71651902a480057a01341e63588936
+	sha512sums = 5ab22f35adfd48444accef6ffa2483665bd178dbad2320929b7be7e4bdc8a2782087f36c8b518537765bcf12dfdb3f5fcc19b8b34f41f2e1f85fb81071728e55
+	sha512sums = d856c5469703168e8cd3b53b68cca7555885c7c01ee7bad69dfc070448247c2da8434c1a49455edab6b6a0cf6ed127a1729758137b3535dd881c374de7e17c1c
+	sha512sums = 620581599f1b0c4c6d4fdb87a6b41c937b8ef79401a6a047f8556517c726a5c61f9fc241a3d82a836b5728de3aa36a11d45cbfb1beb111e35c75485cb7b97228
+	sha512sums = 59ccef79f578997b5a1ef5bf53bc36beb233f935b13da466b887254272036b876946e1b74ed3692f4dc8bc2cc3855a61f06d047e179d8aefe73afbfeb886b655
 	sha512sums = 01aaf2d6019003ab69cd2e9886618d59bed27062f68fe72f29662f70af9206ce3921053c4cab30c370da958be243a6b19e85094af40ff93b6e370505ddd8bbe2
 	sha512sums = cee672a3fb9bffdac836a9aa00c898a38303144be44521363ad8e5109aebaa00e31fc0ae921e3a71a87e734fc614f6b3350009d5ec899bc5d78e6fe6d6c8fc01
 	sha512sums = 18b1964cb4e3fc2eaa93a7ef79e4b9b185584d33ad4f7fa33cd33a74516334136d9cf0ee25921c189250420b751c753cb0142227e8de39e14f8d110e97cd8e30
-	sha512sums = ad649b9671d55280485000f2f74beb676065dda7596d0dbc879a3323495b8e0384454692e2d380a055dc72d5056b2020826d056e163d64b85762ad84438e2509
+	sha512sums = 5b13cd565d2c73e5a5582dc2efcef58e84ee206b96519c2a371a09b52305620b062ca81daf35ed582e182afcc421b668a8ee3fc999a295fa8973d11482c5083b
 	sha512sums = 235d47ab6b7342db65b73533fab8084484cb95914604ffc68a419a13b41540b5e7983f46808f9b9cfc90bfeb69dfb1dfd8be61167791246e1631e93296a6ac7e
 
 pkgname = opennebula
diff --git a/ChangeLog b/ChangeLog
index 85b51dc7f6dd..ebf3ad9bddee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
+2017-08-24 Sledge Sulaweyo <sledge.sulaweyo#gmail.com>
+
+  * 5.4.0-3:
+  Drop the old service units in favor of the upstream versions
+
 2017-08-13 Sledge Sulaweyo <sledge.sulaweyo#gmail.com>
 
-  * 5.4.0
+  * 5.4.0-1:
   Takeover and upgrade to current release (5.4.0)
 
 2015-05-05 Jason St. John <jstjohn .. purdue . edu>
diff --git a/PKGBUILD b/PKGBUILD
index 30266d0871b8..f3c7ed7ee5e7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
 pkgname=opennebula
 _unstable_pkg=opennebula-unstable
 pkgver=5.4.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Virtual management infrastructure as a service (IaaS) toolkit for cloud computing (NOTE: Read the PKGBUILD!)"
 arch=('i686' 'x86_64')
 url='http://docs.opennebula.org/stable'
@@ -89,26 +89,35 @@ backup=('etc/one/oned.conf'
 changelog=ChangeLog
 source=("http://downloads.opennebula.org/packages/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz"
         'opennebula.service'
+        'opennebula-scheduler.service'
         'opennebula-sunstone.service'
         'opennebula-econe.service'
         'opennebula-oneflow.service'
         'opennebula-onegate.service'
+        'opennebula-novnc.service'
+        'opennebula.conf'
+        'opennebula.logrotate'
         'chown_fix.patch'
         'set_locations.patch'
         'fix_kvm_emulator.patch'
         'vip.sh.patch'
         'opennebula.install')
-sha512sums=('4d7d4f6c20a6185539a88006e4d15681d90cee45506d36017a538415a3b3cce809f02ff248013f9e2daa5f1d20afd308a0a014853b8462723ad6ba5acaa84626'
-            'd86b01dd0b0718e1f2c75ffa1220a621ce4953d2cb722defef51c9cb0ec7b3f7709c7cd760c87da9ecb16468ffed2eb7ecb40295f0d24f275648758784ecb745'
-            '165232dfcae58a19dac689cf11c3b49ec0dea5c98835f7ced2c3cc32819204ffd16b90ac67e421730339613cc306577cebfe305d19ed5ea5edbfca70785f52f5'
-            'f3b9bad7c234010b3aab20df17a4c2ab74242e2305acc2cdfa3e36130674c8804aa5c89bdd8ca952d3d188541570da9841fa308d6f5e8dfc9c433628c7628898'
-            'a8e9c781f575d57ba8badb4491ffb4ed1dd5b2b5b7434735974516f2a1533aca5b64a898759b861ca0aff72fe1c629547d8dcbbc29ad45429d3e29f4e7a01160'
-            '0fcfa0990623f6df0d48f24d1bcbc7482e589a454f33e47b4832633f064475d69f1784d87588d66e6d8b37ee448ab64e9a73442c56fcdd3eca66e4b487ea7b84'
-            '01aaf2d6019003ab69cd2e9886618d59bed27062f68fe72f29662f70af9206ce3921053c4cab30c370da958be243a6b19e85094af40ff93b6e370505ddd8bbe2'
-            'cee672a3fb9bffdac836a9aa00c898a38303144be44521363ad8e5109aebaa00e31fc0ae921e3a71a87e734fc614f6b3350009d5ec899bc5d78e6fe6d6c8fc01'
-            '18b1964cb4e3fc2eaa93a7ef79e4b9b185584d33ad4f7fa33cd33a74516334136d9cf0ee25921c189250420b751c753cb0142227e8de39e14f8d110e97cd8e30'
-            'ad649b9671d55280485000f2f74beb676065dda7596d0dbc879a3323495b8e0384454692e2d380a055dc72d5056b2020826d056e163d64b85762ad84438e2509'
-            '235d47ab6b7342db65b73533fab8084484cb95914604ffc68a419a13b41540b5e7983f46808f9b9cfc90bfeb69dfb1dfd8be61167791246e1631e93296a6ac7e')
+sha512sums=('4d7d4f6c20a6185539a88006e4d15681d90cee45506d36017a538415a3b3cce809f02ff248013f9e2daa5f1d20afd308a0a014853b8462723ad6ba5acaa84626' #package
+            '0b139d219d9797231d55b3f1f0c5a0b94df46d7feda2853844c774b791ec788d2c093bfd4d3714ba41ab6ec3286b9fa3e7ae8126830020fe3c4422d7a15811e3' #opennebula.service
+            'b1a361cabc5b49ec8cbe497d8a6f205ed222dadda70ec33f922050b8bdf86b1e52c7098d732b752493ce3626c043f6b482f33dd380f0ebaaf2f53415f58cb75d' #opennebula-scheduler.service
+            '9e6c1017a58e5d53529342c55b241c4d2dac1470fc163e4e8c4e69fe42da4d2d8a58dafdf5ab2adb30ac1d8cdc79d73f7b66392855a8f4ce1fa7e7da65554ac7' #opennebula-sunstone.service
+            '62e8a3640df5e4a9619cbd24dddaa273103fe0b4af5edd6947442c213dbff34993868f091662ce42c0c7b1398a3407bf62c0a57b5cf8f88f0d50f0270040c0e3' #opennebula-econe.service
+            '302b677ef3ce17fafd1ab79926acf91729695f6eeec1dc0cc0169c140d3b69caecd5fbe349c54e5e2c4e33f5d83de40b7d71651902a480057a01341e63588936' #opennebula-oneflow.service
+            '5ab22f35adfd48444accef6ffa2483665bd178dbad2320929b7be7e4bdc8a2782087f36c8b518537765bcf12dfdb3f5fcc19b8b34f41f2e1f85fb81071728e55' #opennebula-onegate.service
+            'd856c5469703168e8cd3b53b68cca7555885c7c01ee7bad69dfc070448247c2da8434c1a49455edab6b6a0cf6ed127a1729758137b3535dd881c374de7e17c1c' #opennebula-novnc.service
+            '620581599f1b0c4c6d4fdb87a6b41c937b8ef79401a6a047f8556517c726a5c61f9fc241a3d82a836b5728de3aa36a11d45cbfb1beb111e35c75485cb7b97228' #opennebula.conf
+            '59ccef79f578997b5a1ef5bf53bc36beb233f935b13da466b887254272036b876946e1b74ed3692f4dc8bc2cc3855a61f06d047e179d8aefe73afbfeb886b655' #opennebula.logrotate
+            '01aaf2d6019003ab69cd2e9886618d59bed27062f68fe72f29662f70af9206ce3921053c4cab30c370da958be243a6b19e85094af40ff93b6e370505ddd8bbe2' #chown_fix.patch
+            'cee672a3fb9bffdac836a9aa00c898a38303144be44521363ad8e5109aebaa00e31fc0ae921e3a71a87e734fc614f6b3350009d5ec899bc5d78e6fe6d6c8fc01' #set_locations.patch
+            '18b1964cb4e3fc2eaa93a7ef79e4b9b185584d33ad4f7fa33cd33a74516334136d9cf0ee25921c189250420b751c753cb0142227e8de39e14f8d110e97cd8e30' #fix_kvm_emulator.patch
+            '5b13cd565d2c73e5a5582dc2efcef58e84ee206b96519c2a371a09b52305620b062ca81daf35ed582e182afcc421b668a8ee3fc999a295fa8973d11482c5083b' #vip.sh.patch
+            '235d47ab6b7342db65b73533fab8084484cb95914604ffc68a419a13b41540b5e7983f46808f9b9cfc90bfeb69dfb1dfd8be61167791246e1631e93296a6ac7e' #opennebula.install
+            )
 
 prepare() {
   cd "${pkgname}-${pkgver}"
@@ -142,10 +151,14 @@ package() {
   cd "${pkgname}-${pkgver}"
 
   install -D -m644 "${srcdir}/opennebula.service" "${pkgdir}/usr/lib/systemd/system/opennebula.service"
+  install -D -m644 "${srcdir}/opennebula-scheduler.service" "${pkgdir}/usr/lib/systemd/system/opennebula-scheduler.service"
+  install -D -m644 "${srcdir}/opennebula-novnc.service" "${pkgdir}/usr/lib/systemd/system/opennebula-novnc.service"
   install -D -m644 "${srcdir}/opennebula-sunstone.service" "${pkgdir}/usr/lib/systemd/system/opennebula-sunstone.service"
   install -D -m644 "${srcdir}/opennebula-econe.service" "${pkgdir}/usr/lib/systemd/system/opennebula-econe.service"
   install -D -m644 "${srcdir}/opennebula-oneflow.service" "${pkgdir}/usr/lib/systemd/system/opennebula-oneflow.service"
   install -D -m644 "${srcdir}/opennebula-onegate.service" "${pkgdir}/usr/lib/systemd/system/opennebula-onegate.service"
+  install -D -m644 "${srcdir}/opennebula.conf" "${pkgdir}/etc/tmpfiles.d/opennebula.conf"
+  install -D -m644 "${srcdir}/opennebula.logrotate" "${pkgdir}/etc/logrotate.d/opennebula"
 
   DESTDIR="${pkgdir}" ./install.sh -u oneadmin -g cloud
 }
diff --git a/opennebula-econe.service b/opennebula-econe.service
index f3b0abaf92ff..294a50b21957 100644
--- a/opennebula-econe.service
+++ b/opennebula-econe.service
@@ -1,15 +1,16 @@
 [Unit]
 Description=OpenNebula econe Server
-After=network.target local-fs.target remote-fs.target opennebula.service
-Requires=opennebula.service
+After=syslog.target network.target remote-fs.target opennebula.service
+BindsTo=opennebula.service
 
 [Service]
 User=oneadmin
 Group=cloud
-Type=forking
-PermissionsStartOnly=true
-ExecStart=/usr/bin/econe-server start
-ExecStop=/usr/bin/econe-server stop
+Type=simple
+
+ExecStart=/usr/bin/ruby /usr/lib/one/ruby/cloud/econe/econe-server.rb
+ExecStop=/bin/kill -TERM $MAINPID
+PIDFile=/var/run/one/econe-server.pid
 Restart=on-abnormal
 
 [Install]
diff --git a/opennebula-novnc.service b/opennebula-novnc.service
new file mode 100644
index 000000000000..306a4dc48060
--- /dev/null
+++ b/opennebula-novnc.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=OpenNebula noVNC Server
+After=syslog.target network.target remote-fs.target
+Before=opennebula-sunstone.service
+
+[Service]
+User=oneadmin
+Group=cloud
+Type=forking
+
+ExecStart=/usr/bin/novnc-server start
+PIDFile=/var/lock/one/.novnc.lock
+
+[Install]
+WantedBy=multi-user.target
diff --git a/opennebula-oneflow.service b/opennebula-oneflow.service
index 4fa287f2d403..28f0e08d8299 100644
--- a/opennebula-oneflow.service
+++ b/opennebula-oneflow.service
@@ -1,15 +1,16 @@
 [Unit]
-Description=OpenNebula econe Server
-After=network.target local-fs.target remote-fs.target opennebula.service
-Requires=opennebula.service
+Description=OpenNebula Flow Service
+After=syslog.target network.target remote-fs.target opennebula.service
+BindsTo=opennebula.service
 
 [Service]
 User=oneadmin
 Group=cloud
-Type=forking
-PermissionsStartOnly=true
-ExecStart=/usr/bin/oneflow-server start
-ExecStop=/usr/bin/oneflow-server stop
+Type=simple
+
+ExecStart=/usr/bin/ruby /usr/lib/one/ruby/cloud/econe/econe-server.rb
+ExecStop=/bin/kill -TERM $MAINPID
+PIDFile=/var/run/one/oneflow.pid
 Restart=on-abnormal
 
 [Install]
diff --git a/opennebula-onegate.service b/opennebula-onegate.service
index aa3644f24d66..faec24cdc58d 100644
--- a/opennebula-onegate.service
+++ b/opennebula-onegate.service
@@ -1,15 +1,16 @@
 [Unit]
-Description=OpenNebula onegate Server
-After=network.target local-fs.target remote-fs.target opennebula.service
-Requires=opennebula.service
+Description=OpenNebula Gate Service
+After=syslog.target network.target remote-fs.target opennebula.service
+BindsTo=opennebula.service
 
 [Service]
 User=oneadmin
 Group=cloud
-Type=forking
-PermissionsStartOnly=true
-ExecStart=/usr/bin/onegate-server start
-ExecStop=/usr/bin/onegate-server stop
+Type=simple
+
+ExecStart=/usr/bin/ruby /usr/lib/one/onegate/onegate-server.rb
+ExecStop=/bin/kill -TERM $MAINPID
+PIDFile=/var/run/one/onegate.pid
 Restart=on-abnormal
 
 [Install]
diff --git a/opennebula-scheduler.service b/opennebula-scheduler.service
new file mode 100644
index 000000000000..de911cbb8dd2
--- /dev/null
+++ b/opennebula-scheduler.service
@@ -0,0 +1,17 @@
+[Unit]
+Description=OpenNebula Cloud Scheduler Daemon
+After=syslog.target network.target remote-fs.target opennebula.service
+BindsTo=opennebula.service
+
+[Service]
+User=oneadmin
+Group=cloud
+Type=simple
+
+ExecStart=/usr/bin/mm_sched
+ExecStop=/bin/kill -TERM $MAINPID
+PIDFile=/var/run/one/sched.pid
+Restart=on-abnormal
+
+[Install]
+WantedBy=multi-user.target
diff --git a/opennebula-sunstone.service b/opennebula-sunstone.service
index 0355b8d16f3b..ca5ad85e34a2 100644
--- a/opennebula-sunstone.service
+++ b/opennebula-sunstone.service
@@ -1,15 +1,17 @@
 [Unit]
 Description=OpenNebula Web Interface
-After=network.target local-fs.target remote-fs.target opennebula.service
-Requires=opennebula.service
+After=syslog.target network.target remote-fs.target opennebula.service opennebula-novnc.service
+BindsTo=opennebula.service
 
 [Service]
 User=oneadmin
 Group=cloud
-Type=forking
+Type=simple
 PermissionsStartOnly=true
-ExecStart=/usr/bin/sunstone-server start
-ExecStop=/usr/bin/sunstone-server stop
+
+ExecStart=/usr/bin/ruby /usr/lib/one/sunstone/sunstone-server.rb
+ExecStartPre=/usr/bin/logrotate -s /tmp/logrotate.state -f /etc/logrotate.d/opennebula
+PIDFile=/var/run/one/sunstone.pid
 Restart=on-abnormal
 
 [Install]
diff --git a/opennebula.conf b/opennebula.conf
new file mode 100644
index 000000000000..7d1e64c7e476
--- /dev/null
+++ b/opennebula.conf
@@ -0,0 +1,2 @@
+d /var/lock/one 0755 oneadmin cloud -
+d /var/run/one 0755 oneadmin cloud -
diff --git a/opennebula.logrotate b/opennebula.logrotate
new file mode 100644
index 000000000000..6b8db4c0b89d
--- /dev/null
+++ b/opennebula.logrotate
@@ -0,0 +1,25 @@
+delaycompress
+dateext
+dateformat -%Y%m%d-%s
+
+compress
+weekly
+rotate 52
+
+/var/log/one/one_xmlrpc.log {
+   missingok
+   notifempty
+   copytruncate
+}
+
+/var/log/one/oned.log {
+   missingok
+   notifempty
+   copytruncate
+}
+
+/var/log/one/sched.log {
+   missingok
+   notifempty
+   copytruncate
+}
diff --git a/opennebula.service b/opennebula.service
index f32f691146f7..1c20bbe7304f 100644
--- a/opennebula.service
+++ b/opennebula.service
@@ -1,18 +1,24 @@
 [Unit]
 Description=OpenNebula management
-After=network.target local-fs.target remote-fs.target mysqld.service
+After=syslog.target network.target local-fs.target remote-fs.target mysqld.service
+Before=opennebula-scheduler.service
+BindTo=opennebula-scheduler.service
 
 [Service]
 User=oneadmin
 Group=cloud
-Type=forking
+Type=simple
 PermissionsStartOnly=true
-ExecStartPre=/usr/bin/mkdir -p /var/run/one
-ExecStartPre=/usr/bin/mkdir -p /var/lock/one
-ExecStartPre=/usr/bin/chown -R oneadmin:cloud /var/run/one
-ExecStartPre=/usr/bin/chown -R oneadmin:cloud /var/lock/one
-ExecStart=/usr/bin/one start
-ExecStop=/usr/bin/one stop
+
+# Start daemon in forground mode, when starting as forking process the
+# daemon shuts down without obvious reason.
+ExecStart=/usr/bin/oned -f
+# Log file location must exist
+ExecStartPre=/bin/mkdir -p /var/log/one
+ExecStartPre=/bin/chown oneadmin:cloud /var/log/one
+ExecStartPre=/usr/bin/logrotate -s /tmp/logrotate.state -f /etc/logrotate.d/opennebula
+ExecStop=/bin/kill -TERM $MAINPID
+PIDFile=/var/run/one/oned.pid
 Restart=on-abnormal
 
 [Install]
diff --git a/vip.sh.patch b/vip.sh.patch
index ab0ba7049c43..d2a4bf897cf1 100644
--- a/vip.sh.patch
+++ b/vip.sh.patch
@@ -1,11 +1,17 @@
 --- share/hooks/raft/vip.sh
 +++ share/hooks/raft/vip.sh
-@@ -17,7 +17,7 @@ fi
+@@ -16,11 +16,14 @@
+
  case $ACTION in
  leader)
++    logger -t opennebula-raft -p alert "Taking over floating IP $IP on $INTERFACE"
      sudo ip address add $IP dev $INTERFACE
 -    arping -c 5 -A -I $INTERFACE ${IP%%/*}
-+    arping -c 5 -U -I $INTERFACE ${IP%%/*}
++    sudo arping -c 3 -U -I $INTERFACE ${IP%%/*}
++    sudo arping -c 3 -UA -I $INTERFACE ${IP%%/*}
      ;;
 
  follower)
++    logger -t opennebula-raft -p alert "Giving up floating IP $IP on $INTERFACE"
+     sudo ip address del $IP dev $INTERFACE
+     ;;