From: Frank Brehm <frank@brehm-online.com>
Date: Thu, 31 May 2018 11:49:21 +0000 (+0200)
Subject: saving uncommitted changes in /etc prior to emerge run
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=627a0fd28204d883094e6e9047097b86aaa25b21;p=config%2Fberta%2Fetc.git

saving uncommitted changes in /etc prior to emerge run
---

diff --git a/apache2/httpd.conf b/apache2/httpd.conf
index 9f0f771..39de446 100644
--- a/apache2/httpd.conf
+++ b/apache2/httpd.conf
@@ -128,6 +128,9 @@ LoadModule log_config_module modules/mod_log_config.so
 LoadModule log_forensic_module modules/mod_log_forensic.so
 LoadModule logio_module modules/mod_logio.so
 LoadModule macro_module modules/mod_macro.so
+<IfDefine SSL>
+LoadModule md_module modules/mod_md.so
+</IfDefine>
 LoadModule mime_module modules/mod_mime.so
 LoadModule mime_magic_module modules/mod_mime_magic.so
 LoadModule negotiation_module modules/mod_negotiation.so
diff --git a/init.d/apache2 b/init.d/apache2
index 74ba827..3c7e538 100755
--- a/init.d/apache2
+++ b/init.d/apache2
@@ -34,7 +34,7 @@ APACHE2="/usr/sbin/apache2"
 
 depend() {
 	need net
-	use mysql dns logger netmount postgresql
+	use dns entropy logger mysql netmount postgresql
 	after sshd
 }
 
@@ -151,7 +151,7 @@ modules() {
 }
 
 fullstatus() {
-	if ! type -p $(set -- ${LYNX}; echo $1) 2>&1 >/dev/null; then
+	if ! command -v $(set -- ${LYNX}; echo $1) 2>&1 >/dev/null; then
 		eerror "lynx not found! you need to emerge www-client/lynx"
 	else
 		${LYNX} ${STATUSURL}
@@ -168,7 +168,7 @@ configdump() {
 
 	checkconfd || return 1
 
-	if ! type -p $(set -- ${LYNX}; echo $1) 2>&1 >/dev/null; then
+	if ! command -v $(set -- ${LYNX}; echo $1) 2>&1 >/dev/null; then
 		eerror "lynx not found! you need to emerge www-client/lynx"
 	else
 		echo "${APACHE2} started with '${APACHE2_OPTS}'"