From 0696954893b23fdf69bdf678a6ab8abd73b3c204 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Fri, 5 Jan 2024 20:27:08 +0100
Subject: [PATCH] apache-add-vhost: updated with logrotate support and fix for
 password setting [release 2.4.12-3mamba;Thu Mar 12 2015]

---
 apache-add-vhost | 28 ++++++++++++++++++++++++----
 apache.spec      |  5 ++++-
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/apache-add-vhost b/apache-add-vhost
index cdd52c0..b1b7f1b 100644
--- a/apache-add-vhost
+++ b/apache-add-vhost
@@ -59,8 +59,8 @@ getent passwd $SERVERUSER >/dev/null && {
    exit 1
 }
 
-[ -e /etc/httpd/httpd.d/${SITEURL}.conf ] && {
-   echo "ERROR: a virtual host for ${SITEURL} is already configured; aborting."
+[ -e /etc/httpd/httpd.d/${SERVERNAME}.conf ] && {
+   echo "ERROR: a virtual host for ${SERVERNAME} is already configured; aborting."
    exit 1
 }
 
@@ -79,7 +79,7 @@ useradd ${SERVERUSER} -g sftponly -d ${SERVERROOT} -p ${SERVERPASSWORD} -c "${SE
    exit 1
 }
 
-echo ${SERVERPASSWORD} | passwd ${SERVERPASSWORD} --stdin || {
+echo ${SERVERPASSWORD} | passwd ${SERVERUSER} --stdin || {
    echo "ERROR: unable to set password for ${SERVERUSER}; aborting."
    exit 1
 }
@@ -87,7 +87,7 @@ echo ${SERVERPASSWORD} | passwd ${SERVERPASSWORD} --stdin || {
 mkdir -p ${DOCUMENTROOT} ${LOGROOT}
 chown ${SERVERUSER}.sftponly ${DOCUMENTROOT}
 
-cat > /etc/httpd/httpd.d/${SITEURL}.conf << _EOF
+cat > /etc/httpd/httpd.d/${SERVERNAME}.conf << _EOF
 <VirtualHost *:80>
    ServerAdmin $SERVERADMIN
    DocumentRoot $DOCUMENTROOT
@@ -107,6 +107,26 @@ cat > /etc/httpd/httpd.d/${SITEURL}.conf << _EOF
 </Directory>
 _EOF
 
+cat > /etc/logrotate.d/${SERVERNAME} << _EOF
+${ACCESSLOG} {
+    monthly
+    rotate 12
+    copytruncate
+    compress
+    notifempty
+    missingok
+}
+
+${ERRORLOG} {
+    monthly
+    rotate 12
+    copytruncate
+    compress
+    notifempty
+    missingok
+}
+_EOF
+
 apachectl configtest >/dev/null || {
    echo "ERROR: there is a problem in Apache configuration, so I won't reload it; aborting."
    exit 1
diff --git a/apache.spec b/apache.spec
index 0722ccd..572ba0c 100644
--- a/apache.spec
+++ b/apache.spec
@@ -6,7 +6,7 @@
 
 Name:          apache
 Version:       2.4.12
-Release:       2mamba
+Release:       3mamba
 Epoch:         1
 Summary:       The Apache webserver
 Group:         System/Servers
@@ -435,6 +435,9 @@ exit 0
 %{_libdir}/apache/mod_suexec.so
 
 %changelog
+* Thu Mar 12 2015 Silvan Calarco <silvan.calarco@mambasoft.it> 2.4.12-3mamba
+- apache-add-vhost: updated with logrotate support and fix for password setting
+
 * Thu Feb 12 2015 Silvan Calarco <silvan.calarco@mambasoft.it> 2.4.12-2mamba
 - added apache-add-vhost and sftponly group to simplify virtualhosts creation with sftp access
 - removed obsolete sysv initscript