Commit 11ecc622 authored by Natanael Copa's avatar Natanael Copa

main/alpine-conf: fix for setup-acf

fixes #530
(cherry picked from commit d50cd6ee)

Conflicts:

	main/alpine-conf/APKBUILD
parent 3f325048
From 325534f013c9b1a46d7587048f913a1984c46802 Mon Sep 17 00:00:00 2001
From: Mika Havela <mika.havela@gmail.com>
Date: Wed, 9 Feb 2011 10:21:15 +0100
Subject: [PATCH] Bugfix: If hostname -f does not work, then ssl creation will break and acf won't work
FQDN hostname might not be set in /etc/hosts and this could cause 'hostname -f' to fail. Even this does not happen too often, it still is a possibility. This patch prevents the problem.
---
setup-acf.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/setup-acf.in b/setup-acf.in
index 4f2afec..c6f621e 100644
--- a/setup-acf.in
+++ b/setup-acf.in
@@ -75,7 +75,7 @@ prompt = no
[ req_dn ]
OU=HTTPS server
-CN=$(hostname -f)
+CN=$(hostname -f || hostname)
emailAddress=${EMAIL:-postmaster@example.com}
[ cert_type ]
--
1.7.3.5
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alpine-conf
pkgver=2.5.4
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
source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2
editor.patch
0001-Bugfix-If-hostname-f-does-not-work-then-ssl-creation.patch
"
arch="noarch"
license="GPL-2"
......@@ -37,4 +38,5 @@ package() {
done
}
md5sums="91a2b8a150917cc06f6c9ec839b70bb0 alpine-conf-2.5.4.tar.bz2
c6f425ae21ff983f94b64eef8c236b22 editor.patch"
c6f425ae21ff983f94b64eef8c236b22 editor.patch
e26e1250fdd31edebd1303ea51dd635c 0001-Bugfix-If-hostname-f-does-not-work-then-ssl-creation.patch"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment