Moved all systemd unit changes to their own aegir service units, set aegir user as an alias use of http, and reorganised PHP/-FPM configurations.

1 files changed, 20 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 46e80f0c9349..c480cad508a0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = aegir
 	pkgdesc = Configuration for a dedicated Aegir server to host Drupal sites.
-	pkgver = 7.x_3.0_beta2
-	pkgrel = 2
+	pkgver = 7.x_3.0
+	pkgrel = 1
 	url = http://aegirproject.org
 	install = aegir.install
 	arch = any
@@ -17,21 +17,27 @@ pkgbase = aegir
 	depends = sudo
 	depends = smtp-forwarder
 	depends = unzip
+	optdepends = ruby-mailcatcher: catch mail forwarded to it and serve it on a web UI
+	optdepends = msmtp-mta: smtp forwarder
 	options = emptydirs
-	source = msmtprc.aegir
-	source = nginx.conf
-	source = nginx.svc.conf
-	source = aegir.ini
-	source = sudoers
 	source = aegir.service
 	source = aegir.target
-	md5sums = ef91c3e0f09e6737105fc1b9971758cc
-	md5sums = 829ac9283a168f796354e78e8bc8e496
-	md5sums = 75535f9870f06c540f513262a9b7b1ab
-	md5sums = 879237d0ca0dc54d5cdb4307adb40005
-	md5sums = cb3462fda27156851badf51d5a0595ae
-	md5sums = 4889b3de48732ec149a71aeb72039455
-	md5sums = 80773e4278e09b14cc6843e346540a9d
+	source = msmtprc
+	source = mysqld-aegir.service
+	source = nginx-aegir.service
+	source = nginx.conf
+	source = php-fpm-aegir.service
+	source = php-fpm.conf
+	source = sudoers
+	md5sums = 2c74cf45b76503d2912c89da4a7bcccb
+	md5sums = c279899d0b987e4d53ea85d0f154a510
+	md5sums = d43026960060bc677549baa26a24c9ee
+	md5sums = 7559c51ec89b4d65a1193b3d6d6da297
+	md5sums = ef858752158383dfde4c8b7f8cb7c6f0
+	md5sums = 7edbcc6b449a2f09ed93f88b77f300a5
+	md5sums = f9f1b1a7e551c718c154c1c745827b1e
+	md5sums = b1300cd3bd23a2544e2eff247cad2f80
+	md5sums = cb65729f01d5d641fc85518c2175a13a
 
 pkgname = aegir