remove setup-runkexec; add run-kexec; mod/fix for run script of qmail…

…; add CustomHeader for hiawatha.conf.base; fix install-pure-ftpd-without-cap
mustafaramadhan · Aug 25, 2017 · 5491fca · 5491fca
1 parent c4536d9
commit 5491fca
Show file tree

Hide file tree

Showing 12 changed files with 54 additions and 87 deletions.
diff --git a/kloxo/bin/kloxoversion b/kloxo/bin/kloxoversion
@@ -1 +1 @@
-7.0.0.c-2017082302
+7.0.0.c-2017082501
diff --git a/kloxo/file/qmail/var/qmail/supervise/imap4-ssl/run b/kloxo/file/qmail/var/qmail/supervise/imap4-ssl/run
@@ -15,7 +15,7 @@ if [ -f /var/qmail/control/softlimit ] ; then
 	### MR -- softlimit file must content with '/usr/bin/softlimit -m SOFTLIMITVAR'
 	### where SOFTLIMITVAR is 72000000 for 64bit and 18000000
 	### Note: incresing SOFTLIMITVAR if not enough (example: because 'login fail')
-	SOFTLIMIT=$(cat /var/qmail/control/softlimit)
+	SOFTLIMIT=$(cat /var/qmail/control/softlimit|tr '\r' ' '|tr '\n' ' ')
 else
 	SOFTLIMIT=""
 fi

diff --git a/kloxo/file/qmail/var/qmail/supervise/imap4/run b/kloxo/file/qmail/var/qmail/supervise/imap4/run
@@ -15,7 +15,7 @@ if [ -f /var/qmail/control/softlimit ] ; then
 	### MR -- softlimit file must content with '/usr/bin/softlimit -m SOFTLIMITVAR'
 	### where SOFTLIMITVAR is 72000000 for 64bit and 18000000
 	### Note: incresing SOFTLIMITVAR if not enough (example: because 'login fail')
-	SOFTLIMIT=$(cat /var/qmail/control/softlimit)
+	SOFTLIMIT=$(cat /var/qmail/control/softlimit|tr '\r' ' '|tr '\n' ' ')
 else
 	SOFTLIMIT=""
 fi

diff --git a/kloxo/file/qmail/var/qmail/supervise/pop3-ssl/run b/kloxo/file/qmail/var/qmail/supervise/pop3-ssl/run
@@ -14,7 +14,7 @@ if [ -f /var/qmail/control/softlimit ] ; then
 	### MR -- softlimit file must content with '/usr/bin/softlimit -m SOFTLIMITVAR'
 	### where SOFTLIMITVAR is 72000000 for 64bit and 18000000
 	### Note: incresing SOFTLIMITVAR if not enough (example: because 'login fail')
-	SOFTLIMIT=$(cat /var/qmail/control/softlimit)
+	SOFTLIMIT=$(cat /var/qmail/control/softlimit|tr '\r' ' '|tr '\n' ' ')
 else
 	SOFTLIMIT=""
 fi

diff --git a/kloxo/file/qmail/var/qmail/supervise/pop3/run b/kloxo/file/qmail/var/qmail/supervise/pop3/run
@@ -14,7 +14,7 @@ if [ -f /var/qmail/control/softlimit ] ; then
 	### MR -- softlimit file must content with '/usr/bin/softlimit -m SOFTLIMITVAR'
 	### where SOFTLIMITVAR is 72000000 for 64bit and 18000000
 	### Note: incresing SOFTLIMITVAR if not enough (example: because 'login fail')
-	SOFTLIMIT=$(cat /var/qmail/control/softlimit)
+	SOFTLIMIT=$(cat /var/qmail/control/softlimit|tr '\r' ' '|tr '\n' ' ')
 else
 	SOFTLIMIT=""
 fi

diff --git a/kloxo/file/qmail/var/qmail/supervise/smtp-ssl/run b/kloxo/file/qmail/var/qmail/supervise/smtp-ssl/run
@@ -51,7 +51,7 @@ if [ -f /var/qmail/control/softlimit ] ; then
 	### MR -- softlimit file must content with '/usr/bin/softlimit -m SOFTLIMITVAR'
 	### where SOFTLIMITVAR is 72000000 for 64bit and 18000000
 	### Note: incresing SOFTLIMITVAR if not enough (example: because 'login fail')
-	SOFTLIMIT=$(cat /var/qmail/control/softlimit)
+	SOFTLIMIT=$(cat /var/qmail/control/softlimit|tr '\r' ' '|tr '\n' ' ')
 else
 	SOFTLIMIT=""
 fi

diff --git a/kloxo/file/qmail/var/qmail/supervise/smtp/run b/kloxo/file/qmail/var/qmail/supervise/smtp/run
@@ -52,7 +52,7 @@ if [ -f /var/qmail/control/softlimit ] ; then
 	### MR -- softlimit file must content with '/usr/bin/softlimit -m SOFTLIMITVAR'
 	### where SOFTLIMITVAR is 72000000 for 64bit and 18000000
 	### Note: incresing SOFTLIMITVAR if not enough (example: because 'login fail')
-	SOFTLIMIT=$(cat /var/qmail/control/softlimit)
+	SOFTLIMIT=$(cat /var/qmail/control/softlimit|tr '\r' ' '|tr '\n' ' ')
 else
 	SOFTLIMIT=""
 fi

diff --git a/kloxo/file/qmail/var/qmail/supervise/submission/run b/kloxo/file/qmail/var/qmail/supervise/submission/run
@@ -51,7 +51,7 @@ if [ -f /var/qmail/control/softlimit ] ; then
 	### MR -- softlimit file must content with '/usr/bin/softlimit -m SOFTLIMITVAR'
 	### where SOFTLIMITVAR is 72000000 for 64bit and 18000000
 	### Note: incresing SOFTLIMITVAR if not enough (example: because 'login fail')
-	SOFTLIMIT=$(cat /var/qmail/control/softlimit)
+	SOFTLIMIT=$(cat /var/qmail/control/softlimit|tr '\r' ' '|tr '\n' ' ')
 else
 	SOFTLIMIT=""
 fi

diff --git a/kloxo/init/hiawatha.conf.base b/kloxo/init/hiawatha.conf.base
@@ -124,4 +124,9 @@ ErrorHandler = 404:/theme/lbin/sitepreview.php
 ErrorHandler = 501:/error/501.html
 #ErrorHandler = 502:/error/502.html
 ErrorHandler = 503:/error/503.html
-#ErrorHandler = 504:/error/504.html
+#ErrorHandler = 504:/error/504.html
+
+CustomHeader = X-Content-Type-Options:nosniff
+CustomHeader = X-XSS-Protection:1;mode=block
+CustomHeader = X-Frame-Options:SAMEORIGIN
+CustomHeader = Access-Control-Allow-Origin:*
diff --git a/kloxo/pscript/install-pure-ftpd-without-cap b/kloxo/pscript/install-pure-ftpd-without-cap
@@ -3,7 +3,9 @@
 echo "*** Install Pure-ftpd rpm without capability (resolve for LXC container) ***"
 
 if [ "${1}" == "" ] ; then
-	ver="1.0.37-1"
+	ver1=$(rpm -q --queryformat '%{VERSION}' pure-ftpd)
+	rel=$(rpm -q --queryformat '%{RELEASE}' pure-ftpd)
+	ver="${ver1}-${rel}"
 else
 	ver=${1}
 fi
@@ -12,26 +14,31 @@ cd /tmp
 rm -f pure-ftpd*.rpm
 
 echo "- Get src.rpm from mratwork repo and installed"
-wget http://rpms.mratwork.com/repo/mratwork/SRPMS/pure-ftpd-${ver}.mr.src.rpm
+if [ "$(ps --no-headers -o comm 1)" == "systemd" ] ; then
+	wget http://download.fedoraproject.org/pub/epel/7/SRPMS/p/pure-ftpd-${ver}.src.rpm
+else
+	wget http://rpms.mratwork.com/repo/mratwork/SRPMS/pure-ftpd-${ver}.mr.src.rpm
+fi
+
 rpm -ivh pure-ftpd*
 
 echo " - Replace to '--without-capabilities' in pure-ftpd.spec"
 sed -i 's/--with-capabilities/--without-capabilities/g' /root/rpmbuild/SPECS/pure-ftpd.spec
 echo " - Change 'release' to 100"
-sed -i 's/1%{?dist}/100%{?dist}/g' /root/rpmbuild/SPECS/pure-ftpd.spec
+sed -i 's/%{?dist}/00%{?dist}/g' /root/rpmbuild/SPECS/pure-ftpd.spec
 
 echo "- Install dependencies"
-yum install pam-devel libcap-devel openldap-devel selinux-policy-devel rpm-build -y
+yum install pam-devel libcap-devel openldap-devel selinux-policy-devel rpm-build MariaDB-devel postgresql-devel -y
 
 echo "- Create rpm"
-rpmbuild -bb --define 'dist .mr.el6' /root/rpmbuild/SPECS/pure-ftpd.spec
+rpmbuild -bb --define 'dist .mr' /root/rpmbuild/SPECS/pure-ftpd.spec
 
 echo "- Update rpm"
-rpm -Uvh /root/rpmbuild/RPMS/x86_64/pure-ftpd-${ver}00.mr.el6.x86_64.rpm
+rpm -Uvh /root/rpmbuild/RPMS/x86_64/pure-ftpd-${ver1}*.rpm
 
 sh /script/restart-ftp
 
 echo
 echo "* Note:"
 echo "  - Format: $0 [target-version]"
-echo "    where [target-version] = 1.0.37-1 (by default)"
+echo "    where [target-version] = 1.0.37-1"
diff --git a/kloxo/pscript/run-kexec b/kloxo/pscript/run-kexec
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+echo "*** Run 'kexec' (for fast reboot) ***"
+
+
+if [ "$(sh /script/virtual-info -t)" == "container" ] ; then
+	echo '- Not work in Container-type VPS (like OpenVZ)'
+	exit
+fi
+
+if [ "$(rpm -qa kexec-tools)" == "" ] ; then
+	echo "- Install 'kexec-tools'"
+	yum install kexec-tools -y
+fi
+
+if [ "${1}" != "" ] ; then
+	KV=${1}
+else
+	VM=$(ls /boot/ | grep vmlinuz|tail -n 1)
+	KV=${VM#vmlinuz-}
+fi
+
+PC=$(cat /proc/cmdline)
+
+kexec -l --append="${PC}" --initrd=/boot/initramfs-${KV}.img /boot/vmlinuz-${KV}
+kexec -e
diff --git a/kloxo/pscript/setup-runkexec b/kloxo/pscript/setup-runkexec