summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames An2015-07-25 19:26:04 -0400
committerJames An2015-07-25 19:26:04 -0400
commit8580155e53937717ed5a0f6cebeb32eb2263a775 (patch)
tree87a1f33c785cf00c1094efa8779012922095b5c4
parent245e6ef11fbf5a5e35a23a3aa67bc2e87fbc4993 (diff)
downloadaur-8580155e53937717ed5a0f6cebeb32eb2263a775.tar.gz
Updated to latest version and modified systemd unit files to be more resilient.
-rw-r--r--PKGBUILD25
-rw-r--r--aegir.service3
-rw-r--r--aegir.target2
-rw-r--r--msmtprc.aegir1
4 files changed, 16 insertions, 15 deletions
diff --git a/PKGBUILD b/PKGBUILD
index d4fa8d721d2..0da2c8a3051 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
# Maintainer: James An <james@jamesan.ca>
pkgname=aegir
-pkgver=7.x_3.0_beta2
-pkgrel=2
+pkgver=7.x_3.0
+pkgrel=1
pkgdesc="Configuration for a dedicated Aegir server to host Drupal sites."
arch=('any')
url='http://aegirproject.org'
@@ -31,20 +31,20 @@ source=(
"$pkgname.service"
"$pkgname.target"
)
-md5sums=('ef91c3e0f09e6737105fc1b9971758cc'
+md5sums=('d43026960060bc677549baa26a24c9ee'
'829ac9283a168f796354e78e8bc8e496'
- '75535f9870f06c540f513262a9b7b1ab'
+ '86395485765bb73ae09d28e0d7101613'
'879237d0ca0dc54d5cdb4307adb40005'
'cb3462fda27156851badf51d5a0595ae'
- '4889b3de48732ec149a71aeb72039455'
- '80773e4278e09b14cc6843e346540a9d')
+ '25414ba4e4bd50f31286db9a349afa4d'
+ '5020ae6d02a9796e979d1619a9a02957')
-pkgver() {
- echo \
- $(drush rl --fields=version --field-labels=0 provision | sort | grep -v 'dev' | tail -n1 | tr '-' '_' | tr -d ' ') \
- $(drush rl --fields=version --field-labels=0 hostmaster | sort | grep -v 'dev' | tail -n1 | tr '-' '_' | tr -d ' ') \
- | tr ' ' $'\n' | sort -ur | head -n1
-}
+#~ pkgver() {
+ #~ echo \
+ #~ $(drush rl --fields=version --field-labels=0 provision | sort | grep -v 'dev' | tail -n1 | tr '-' '_' | tr -d ' ') \
+ #~ $(drush rl --fields=version --field-labels=0 hostmaster | sort | grep -v 'dev' | tail -n1 | tr '-' '_' | tr -d ' ') \
+ #~ | tr ' ' $'\n' | sort -ur | head -n1
+#~ }
prepare() {
for extension in gd pdo_mysql; do
@@ -71,6 +71,7 @@ package() {
msg2 'Creating $pkgname directory structure'
mkdir -p "$pkgdir/var/lib/$pkgname"
+ ln -s /etc/drush "$pkgdir/var/lib/$pkgname/.drush"
umask 077
mkdir -p "$pkgdir/var/lib/$pkgname/"{backups,clients/admin,config/{includes,self,server_master/nginx/{platform,post,pre,subdir,platform,vhost}.d}}
umask 022
diff --git a/aegir.service b/aegir.service
index 86963a15bb8..a85639223cd 100644
--- a/aegir.service
+++ b/aegir.service
@@ -1,7 +1,8 @@
[Unit]
Description=Aegir queue daemon
PartOf=aegir.target
-After=mysqld.service php-fpm.service nginx.service
+Wants=mysqld.service php-fpm.service
+After=mysqld.service php-fpm.service
[Service]
Type=simple
diff --git a/aegir.target b/aegir.target
index 10962e08211..6315193173f 100644
--- a/aegir.target
+++ b/aegir.target
@@ -1,6 +1,6 @@
[Unit]
Description=Aegir Hosting System
-Requires=aegir.service mailcatcher.service mailcatcher-smtp.socket mysqld.service nginx.service php-fpm.service
+Wants=aegir.service mailcatcher.service mailcatcher-smtp.socket mysqld.service nginx.service php-fpm.service
After=aegir.service mailcatcher.service mailcatcher-smtp.socket mysqld.service nginx.service php-fpm.service
PropagatesReloadTo=aegir.service mailcatcher.service mailcatcher-smtp.socket mysqld.service nginx.service php-fpm.service
diff --git a/msmtprc.aegir b/msmtprc.aegir
index 7e826cd1a85..facd259ee86 100644
--- a/msmtprc.aegir
+++ b/msmtprc.aegir
@@ -1,6 +1,5 @@
account mailcatcher
host localhost
-port 25
auto_from on
account default: mailcatcher