summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoseph R. Quinn2019-05-22 10:55:21 -0400
committerJoseph R. Quinn2019-05-22 10:55:21 -0400
commit55d7575ed2f34093da3f4dfb3713c429ae8beb86 (patch)
tree9949ead354f7484a78e950fffe4518b6bf3210ab
parentc6e25f13dd2c935d0e6bf3acbf2c09ca91f15754 (diff)
downloadaur-55d7575ed2f34093da3f4dfb3713c429ae8beb86.tar.gz
Updating to v3.1.0. Sorting file locations.
-rw-r--r--.SRCINFO7
-rw-r--r--.install9
-rw-r--r--PKGBUILD23
3 files changed, 26 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 30708ac177de..95ed415dbd14 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = nginx-h5bp-server-configs
pkgdesc = Nginx HTTP server boilerplate configs
- pkgver = 3.0.1
+ pkgver = 3.1.0
pkgrel = 1
url = https://github.com/h5bp/server-configs-nginx
install = .install
@@ -8,9 +8,8 @@ pkgbase = nginx-h5bp-server-configs
license = MIT
depends = nginx
provides = nginx-h5bp-server-configs
- backup = etc/nginx/nginx.conf
- source = https://github.com/h5bp/server-configs-nginx/archive/3.0.1.tar.gz
- sha1sums = 7f3c0d396093d2c1365a5550a89c7f49cece5068
+ source = https://github.com/h5bp/server-configs-nginx/archive/3.1.0.tar.gz
+ sha1sums = c611f5c717114c461f2d08b3bf9de47f590cb8cf
pkgname = nginx-h5bp-server-configs
diff --git a/.install b/.install
index 33b11fa4f2f9..ae1d6249b37f 100644
--- a/.install
+++ b/.install
@@ -1,4 +1,9 @@
post_install() {
- echo 'mime.types conflicts with other packages. To use the h5bp'
- echo 'version, replace `/etc/nginx/mime.types` with `/etc/nginx/h5bp.mime.types`'
+ echo "mime.types conflicts with the base nginx package. To use the h5bp's"
+ echo 'version, replace the include for `/etc/nginx/mime.types`'
+ echo 'with `/etc/nginx/h5bp/mime.types`'
+}
+
+post_update() {
+ post_install
}
diff --git a/PKGBUILD b/PKGBUILD
index 2f35d9aa622c..f9bfadd74a1d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Joseph R. Quinn <quinn period josephr at protonmail dot com>
pkgname=nginx-h5bp-server-configs
_pkgname=server-configs-nginx
-pkgver=3.0.1
+pkgver=3.1.0
pkgrel=1
pkgdesc="Nginx HTTP server boilerplate configs"
arch=('any')
@@ -10,16 +10,25 @@ license=('MIT')
depends=('nginx')
provides=("$pkgname")
install='.install'
-source=("https://github.com/h5bp/server-configs-nginx/archive/$pkgver.tar.gz")
-sha1sums=('7f3c0d396093d2c1365a5550a89c7f49cece5068')
-backup=('etc/nginx/nginx.conf')
+source=("https://github.com/h5bp/$_pkgname/archive/$pkgver.tar.gz")
+sha1sums=('c611f5c717114c461f2d08b3bf9de47f590cb8cf')
+
+prepare() {
+ cd "$_pkgname-$pkgver"
+
+ sed -i -e 's|mime.types|h5bp/mime.types|g' 'h5bp/media_types/media_types.conf'
+}
package() {
cd "$_pkgname-$pkgver"
install -d "$pkgdir/etc/nginx/"
- mv conf.d "$pkgdir/etc/nginx/"
+ install -d "$pkgdir/etc/nginx/conf.d"
+ install -d "$pkgdir/etc/nginx/sites-available"
+ install -d "$pkgdir/etc/nginx/sites-enabled"
+ install -Dm644 conf.d/.default.conf "$pkgdir/etc/nginx/sites-available/"
+ install -Dm644 conf.d/no-ssl.default.conf "$pkgdir/etc/nginx/sites-available/"
mv h5bp "$pkgdir/etc/nginx/"
- install -Dm755 mime.types "$pkgdir/etc/nginx/h5bp.mime.types"
- install -Dm755 nginx.conf "$pkgdir/etc/nginx/nginx.conf.example"
+ install -Dm644 mime.types "$pkgdir/etc/nginx/h5bp/mime.types"
+ install -Dm644 nginx.conf "$pkgdir/etc/nginx/nginx.conf.example"
install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$_pkgname/LICENSE"
}