diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2012-05-02 08:51:27 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-05-02 08:51:59 +0000 |
| commit | 98fab2ebcb2e11db33670f72b74a9d009ba41d0a (patch) | |
| tree | a60b41a3d1ea1a33995e9523872d633c9e961fb9 | |
| parent | c08ec0cafaaf25b4c83499fac69819b919354f45 (diff) | |
| download | aports-98fab2ebcb2e11db33670f72b74a9d009ba41d0a.tar.bz2 aports-98fab2ebcb2e11db33670f72b74a9d009ba41d0a.tar.xz | |
main/alpine-conf: setup-acf: use new location for mini_httpd.conf
| -rw-r--r-- | main/alpine-conf/0001-setup-acf-use-new-location-for-mini_httpd.conf.patch | 34 | ||||
| -rw-r--r-- | main/alpine-conf/APKBUILD | 6 |
2 files changed, 38 insertions, 2 deletions
diff --git a/main/alpine-conf/0001-setup-acf-use-new-location-for-mini_httpd.conf.patch b/main/alpine-conf/0001-setup-acf-use-new-location-for-mini_httpd.conf.patch new file mode 100644 index 0000000000..4481c3270a --- /dev/null +++ b/main/alpine-conf/0001-setup-acf-use-new-location-for-mini_httpd.conf.patch @@ -0,0 +1,34 @@ +From 4b22b926721293e23fa645c742f5f274a601de9f Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Wed, 2 May 2012 08:49:56 +0000 +Subject: [PATCH] setup-acf: use new location for mini_httpd.conf + +--- + setup-acf.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/setup-acf.in b/setup-acf.in +index 9e1489f..91113c5 100644 +--- a/setup-acf.in ++++ b/setup-acf.in +@@ -87,7 +87,7 @@ EOF + mv $CRTFILE $PEMFILE + fi + +-cat >/etc/mini_httpd.conf <<EOF ++cat >/etc/mini_httpd/mini_httpd.conf <<EOF + nochroot + dir=/var/www/localhost/htdocs + user=nobody +@@ -97,7 +97,7 @@ port=443 + ssl + EOF + if [ -n "$address" ]; then +- echo "host=$address" >> /etc/mini_httpd.conf ++ echo "host=$address" >> /etc/mini_httpd/mini_httpd.conf + fi + + rc-update -q add mini_httpd default +-- +1.7.10 + diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index 5037f46690..1235b3375f 100644 --- a/main/alpine-conf/APKBUILD +++ b/main/alpine-conf/APKBUILD @@ -1,12 +1,13 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-conf pkgver=2.11.0 -pkgrel=1 +pkgrel=2 pkgdesc="Alpine configuration management scripts" url=http://git.alpinelinux.org/cgit/$pkgname depends="openrc" source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2 0001-lbu-do-not-include-var-lib-apk-world-in-apkovl.patch + 0001-setup-acf-use-new-location-for-mini_httpd.conf.patch " arch="all" @@ -38,4 +39,5 @@ package() { done } md5sums="b26bf91d4c3df7baf5ede8ab4f54225a alpine-conf-2.11.0.tar.bz2 -8ffcadf4c724296fb2d86d91ba965187 0001-lbu-do-not-include-var-lib-apk-world-in-apkovl.patch" +8ffcadf4c724296fb2d86d91ba965187 0001-lbu-do-not-include-var-lib-apk-world-in-apkovl.patch +ea6008b3c6d07c816f4eb3a185b7785d 0001-setup-acf-use-new-location-for-mini_httpd.conf.patch" |