remove execs from services that are already done in prerequisite, remove mysql service unit, add onegate service unit

8 files changed, 16 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 26fc09677ecb..6fbadcd908de 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Sat Sep  3 15:59:55 UTC 2016
+# Mon Sep 12 17:58:01 UTC 2016
 pkgbase = opennebula
 	pkgdesc = Virtual management infrastructure as a service (IaaS) toolkit for cloud computing (NOTE: Read the PKGBUILD!)
 	pkgver = 5.0.2
@@ -84,7 +84,6 @@ pkgbase = opennebula
 	backup = etc/one/ec2_driver.default
 	source = http://downloads.opennebula.org/packages/opennebula-5.0.2/opennebula-5.0.2.tar.gz
 	source = opennebula.service
-	source = opennebula-mysqld.service
 	source = opennebula-sunstone.service
 	source = opennebula-econe.service
 	source = opennebula-oneflow.service
@@ -93,7 +92,6 @@ pkgbase = opennebula
 	source = fix_kvm_emulator.patch
 	sha512sums = 95d61476538e32b75c3ac870c4ba19e4f352a90e1d6e76355efab4f4679291ba2fcd223ec39f9b3cbd29bc5c5c7a5388c1c402c5c84b22f81729ff240b6d34b6
 	sha512sums = 6ac7ee8e8fae29e4b37e3928ca3e499b9d83c3ed56b233c8f1822797dc81b2c36cf6f6d8fd4cbd74f582f3df0b859f9ca325fcd094c70806bf394748a03152da
-	sha512sums = f049af21fd192d243019983121046b4257a83d79c6c1d7d1546db799dc4e036c0eb6eca540eb6997a19d72dd47db8533f5b11f2689a81b574783942ae326697d
 	sha512sums = d6342d963d99ef95dbff68775b3be73fd76b39c2c3dbf6f9c47dbb25a5dcb9d6ba2d80ddcd6af35844d2d854a06345b190255576c963ca1bfbca194212653f3d
 	sha512sums = 94cfa67418ea1e9e11ae21debf736f38a1b62c6bbb258a11a3c173c6260babf5edd188ab446d80b64309a8a683e50da6e957dd1183144bc569cfe2d561df4ee5
 	sha512sums = 4c5b3db9378ef04e3ac0fad7dd79e5b3bb0a559c1f2960d86a2f3baaadb60418d3a8e041655b68fdb2df7c6f19a41f02f92f948b0e94d2ffa05010f66fa2f84d
diff --git a/PKGBUILD b/PKGBUILD
index 620ae4857974..c31afbb2eeb9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -87,7 +87,6 @@ backup=('etc/one/oned.conf'
 changelog=ChangeLog
 source=("http://downloads.opennebula.org/packages/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz"
         'opennebula.service'
-        'opennebula-mysqld.service'
         'opennebula-sunstone.service'
         'opennebula-econe.service'
         'opennebula-oneflow.service'
@@ -96,7 +95,6 @@ source=("http://downloads.opennebula.org/packages/${pkgname}-${pkgver}/${pkgname
         'fix_kvm_emulator.patch')
 sha512sums=('95d61476538e32b75c3ac870c4ba19e4f352a90e1d6e76355efab4f4679291ba2fcd223ec39f9b3cbd29bc5c5c7a5388c1c402c5c84b22f81729ff240b6d34b6'
             '6ac7ee8e8fae29e4b37e3928ca3e499b9d83c3ed56b233c8f1822797dc81b2c36cf6f6d8fd4cbd74f582f3df0b859f9ca325fcd094c70806bf394748a03152da'
-            'f049af21fd192d243019983121046b4257a83d79c6c1d7d1546db799dc4e036c0eb6eca540eb6997a19d72dd47db8533f5b11f2689a81b574783942ae326697d'
             'd6342d963d99ef95dbff68775b3be73fd76b39c2c3dbf6f9c47dbb25a5dcb9d6ba2d80ddcd6af35844d2d854a06345b190255576c963ca1bfbca194212653f3d'
             '94cfa67418ea1e9e11ae21debf736f38a1b62c6bbb258a11a3c173c6260babf5edd188ab446d80b64309a8a683e50da6e957dd1183144bc569cfe2d561df4ee5'
 	    '4c5b3db9378ef04e3ac0fad7dd79e5b3bb0a559c1f2960d86a2f3baaadb60418d3a8e041655b68fdb2df7c6f19a41f02f92f948b0e94d2ffa05010f66fa2f84d'
diff --git a/opennebula-econe.service b/opennebula-econe.service
index 20ef0cd5dd3f..cf0923de48f8 100644
--- a/opennebula-econe.service
+++ b/opennebula-econe.service
@@ -8,10 +8,6 @@ User=oneadmin
 Group=cloud
 Type=forking
 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/econe-server start
 ExecStop=/usr/bin/econe-server stop
 
diff --git a/opennebula-mysqld.service b/opennebula-mysqld.service
deleted file mode 100644
index 36d2077e1d6d..000000000000
--- a/opennebula-mysqld.service
+++ /dev/null
@@ -1,20 +0,0 @@
-[Unit]
-Description=OpenNebula management
-After=network.target local-fs.target remote-fs.target mysqld.service 
-Requires=mysqld.service
-Conflicts=opennebula.service
-
-[Service]
-User=oneadmin
-Group=cloud
-Type=forking
-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
-
-[Install]
-WantedBy=multi-user.target
diff --git a/opennebula-oneflow.service b/opennebula-oneflow.service
index 1b836cda9aef..ee938552ee6a 100644
--- a/opennebula-oneflow.service
+++ b/opennebula-oneflow.service
@@ -8,10 +8,6 @@ User=oneadmin
 Group=cloud
 Type=forking
 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/oneflow-server start
 ExecStop=/usr/bin/oneflow-server stop
 
diff --git a/opennebula-onegate.service b/opennebula-onegate.service
new file mode 100644
index 000000000000..8a0af846745e
--- /dev/null
+++ b/opennebula-onegate.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=OpenNebula onegate Server
+After=network.target local-fs.target remote-fs.target opennebula.service
+Requires=opennebula.service
+
+[Service]
+User=oneadmin
+Group=cloud
+Type=forking
+PermissionsStartOnly=true
+ExecStart=/usr/bin/onegate-server start
+ExecStop=/usr/bin/onegate-server stop
+
+[Install]
+WantedBy=multi-user.target
diff --git a/opennebula-sunstone.service b/opennebula-sunstone.service
index 02fe71a9cb3f..ce8eae09f45f 100644
--- a/opennebula-sunstone.service
+++ b/opennebula-sunstone.service
@@ -8,10 +8,6 @@ User=oneadmin
 Group=cloud
 Type=forking
 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/sunstone-server start
 ExecStop=/usr/bin/sunstone-server stop
 
diff --git a/opennebula.service b/opennebula.service
index 316f6bb9ee72..4414e241e74b 100644
--- a/opennebula.service
+++ b/opennebula.service
@@ -1,7 +1,6 @@
 [Unit]
 Description=OpenNebula management
 After=network.target local-fs.target remote-fs.target mysqld.service 
-Conflicts=opennebula-mysqld.service
 
 [Service]
 User=oneadmin