summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames An2017-02-01 17:49:50 -0500
committerJames An2017-02-01 17:49:50 -0500
commit7aafde8a34d463ff67e680324a8d2df5d0d2bd75 (patch)
treef8761ff5870a7309389c96d09bebcbad49b70ad2
parent2ce3a40586293c6a95f1d289a948d96693b58cf9 (diff)
downloadaur-7aafde8a34d463ff67e680324a8d2df5d0d2bd75.tar.gz
Changed aegir queue daemon to not run quietly, fixed nginx configuration symlinks, and added LetsEncrypt-related folders.
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD12
-rw-r--r--aegir.service2
3 files changed, 9 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 664674e1c31..0e35be88caf 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.9
- pkgrel = 1
+ pkgrel = 2
url = http://aegirproject.org
install = aegir.install
arch = any
@@ -29,7 +29,7 @@ pkgbase = aegir
source = php-fpm.systemd.conf
source = php.ini
source = sudoers
- md5sums = b0f2e5dca01b32c967cd823dab6b8779
+ md5sums = 81c8f6285f3f17184dc8655e2942f3fc
md5sums = 95bce00a6c0ac2a0b51642449554105b
md5sums = d43026960060bc677549baa26a24c9ee
md5sums = e1bb28d05fc072f6cf86d18716cf1f97
diff --git a/PKGBUILD b/PKGBUILD
index 746c85ffda3..23df42f8cfe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=aegir
pkgver=7.x_3.9
-pkgrel=1
+pkgrel=2
pkgdesc="Configuration for a dedicated Aegir server to host Drupal sites."
arch=('any')
url='http://aegirproject.org'
@@ -36,7 +36,7 @@ source=("$pkgname.service"
'php.ini'
'sudoers'
)
-md5sums=('b0f2e5dca01b32c967cd823dab6b8779'
+md5sums=('81c8f6285f3f17184dc8655e2942f3fc'
'95bce00a6c0ac2a0b51642449554105b'
'd43026960060bc677549baa26a24c9ee'
'e1bb28d05fc072f6cf86d18716cf1f97'
@@ -72,16 +72,16 @@ package() {
ln -s /etc/drush "$pkgdir/var/lib/$pkgname/.drush"
ln -s "/var/lib/$pkgname/.ssh" "$pkgdir/srv/http/.ssh"
#~ umask 066
- mkdir -p "$pkgdir/var/lib/$pkgname/"{config{,/{includes,server_{localhost,master{,/nginx}}}},clients}
+ mkdir -p "$pkgdir/var/lib/$pkgname/"{config{,/{includes,server_{localhost,master{,/nginx}},{self-signed,ssl}.d,letsencrypt{,.d/well-known/acme-challenge}},clients}
#~ umask 077
mkdir -p "$pkgdir/var/lib/$pkgname/"{backups,config/server_master/nginx/{platform,post,pre,subdir,platform,vhost}.d}
#~ umask 027
mkdir -p "$pkgdir/var/lib/$pkgname/"clients/admin
#~ umask 007
mkdir -p "$pkgdir/var/lib/$pkgname/"config/self
- ln -s "/var/lib/$pkgname/config/server_master/nginx.conf" "$pkgdir/var/lib/$pkgname/config/nginx.conf"
- ln -s "/var/lib/$pkgname/config/includes/nginx_vhost_common.conf" "$pkgdir/var/lib/$pkgname/config/includes/nginx_advanced_include.conf"
- ln -s "/var/lib/$pkgname/config/includes/nginx_vhost_common.conf" "$pkgdir/var/lib/$pkgname/config/includes/nginx_simple_include.conf"
+ ln -s "/var/lib/$pkgname/config/server_master/nginx.conf" "$pkgdir/var/lib/$pkgname/config/nginx.conf"
+ ln -sr "nginx_vhost_common.conf" "$pkgdir/var/lib/$pkgname/config/includes/nginx_advanced_include.conf"
+ ln -sr "nginx_vhost_common.conf" "$pkgdir/var/lib/$pkgname/config/includes/nginx_simple_include.conf"
chown -R http:http "$pkgdir/etc/drush" "$pkgdir/var/lib/$pkgname" "$pkgdir/var/spool/cron/$pkgname"
}
diff --git a/aegir.service b/aegir.service
index f7607c42f5d..524750dcf59 100644
--- a/aegir.service
+++ b/aegir.service
@@ -5,7 +5,7 @@ After=mysqld.service php-fpm.service
[Service]
Type=simple
-ExecStart=/usr/bin/drush --quiet @hostmaster hosting-queued
+ExecStart=/usr/bin/drush @hostmaster hosting-queued
User=http
Restart=always
SuccessExitStatus=1