You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vcl.apache.org by jf...@apache.org on 2017/06/12 17:43:06 UTC
svn commit: r1798497 - in /vcl/trunk: vcl-install.sh web/testsetup.php
Author: jfthomps
Date: Mon Jun 12 17:43:06 2017
New Revision: 1798497
URL: http://svn.apache.org/viewvc?rev=1798497&view=rev
Log:
testsetup.php: added line before calling initGlobals that unsets $_COOKIE['VCLAUTH'] so initGlobals runs as an unauthenticated user if the current person viewing the page is authenticated
vcl-install.sh:
-updated version from 2.4.2 to 2.5
-set ownership of .ht-inc/cryptkey to apache
-set .ht-inc/maintenance and .ht-inc/cryptkey SELinux context to httpd_sys_rw_content_t if SELinux is enabled
Modified:
vcl/trunk/vcl-install.sh
vcl/trunk/web/testsetup.php
Modified: vcl/trunk/vcl-install.sh
URL: http://svn.apache.org/viewvc/vcl/trunk/vcl-install.sh?rev=1798497&r1=1798496&r2=1798497&view=diff
==============================================================================
--- vcl/trunk/vcl-install.sh (original)
+++ vcl/trunk/vcl-install.sh Mon Jun 12 17:43:06 2017
@@ -69,7 +69,7 @@ if [ $? -ne 0 ]; then help; fi
eval set -- "$args"
# ------------------------- variables -------------------------------
-VCL_VERSION=2.4.2
+VCL_VERSION=2.5
DB_USERNAME=vcluser
ADMIN_PASSWORD=
@@ -713,6 +713,11 @@ if [[ $DOWEB -eq 1 ]]; then
ln -s /var/www/html/vcl-$VCL_VERSION /var/www/html/vcl
if [ $? -ne 0 ]; then generic_error "Failed to install VCL web code"; exit 1; fi;
chown apache /var/www/html/vcl/.ht-inc/maintenance
+ chown apache /var/www/html/vcl/.ht-inc/cryptkey
+ if [[ -x /usr/sbin/getenforce ]] && /usr/sbin/getenforce | grep -q -i enforcing; then
+ chcon -t httpd_sys_rw_content_t /var/www/html/vcl/.ht-inc/maintenance
+ chcon -t httpd_sys_rw_content_t /var/www/html/vcl/.ht-inc/cryptkey
+ fi
fi
# ---------------------------- configure web code --------------------------
Modified: vcl/trunk/web/testsetup.php
URL: http://svn.apache.org/viewvc/vcl/trunk/web/testsetup.php?rev=1798497&r1=1798496&r2=1798497&view=diff
==============================================================================
--- vcl/trunk/web/testsetup.php (original)
+++ vcl/trunk/web/testsetup.php Mon Jun 12 17:43:06 2017
@@ -338,6 +338,7 @@ if($createcryptkey) {
$tmp = $_SERVER['SCRIPT_FILENAME'];
$_SERVER['SCRIPT_FILENAME'] = str_replace('testsetup.php', 'index.php', $_SERVER['SCRIPT_FILENAME']);
$actions = array('pages' => array());
+ unset($_COOKIE['VCLAUTH']);
initGlobals();
dbConnect();
checkCryptkey();