testing open_basedir
This commit is contained in:
@@ -37,9 +37,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
|||||||
- Extplorer filemanager
|
- Extplorer filemanager
|
||||||
- Enable OSCP Stapling with Let's Encrypt
|
- Enable OSCP Stapling with Let's Encrypt
|
||||||
- Compress database backup with pigz before updating sites
|
- Compress database backup with pigz before updating sites
|
||||||
- Add support for Ubuntu 19.04 disco
|
- Support for Ubuntu 19.04 (disco) - few php extensions missing
|
||||||
- Add support for Raspbian
|
- Support for Raspbian 9 (stretch) - tested on Raspberry Pi 3b+
|
||||||
- backup letsencrypt certificate before upgrade
|
- backup letsencrypt certificate before upgrade
|
||||||
|
- directives emergency_restart_threshold & emergency_restart_interval to restart php-fpm in case of failure
|
||||||
|
|
||||||
#### Changed
|
#### Changed
|
||||||
|
|
||||||
@@ -73,6 +74,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
|||||||
- --hsts flag with basic html site
|
- --hsts flag with basic html site
|
||||||
- hsts flag on site not secure with letsencrypt
|
- hsts flag on site not secure with letsencrypt
|
||||||
- fix import of previous acme.sh certificate
|
- fix import of previous acme.sh certificate
|
||||||
|
- fix proxy webroot folder creation
|
||||||
|
|
||||||
### v3.9.4 - 2019-03-15
|
### v3.9.4 - 2019-03-15
|
||||||
|
|
||||||
|
|||||||
10
install
10
install
@@ -357,15 +357,7 @@ wo_install_acme_sh() {
|
|||||||
fi
|
fi
|
||||||
cd /opt/acme.sh || exit 1
|
cd /opt/acme.sh || exit 1
|
||||||
# create conf directories
|
# create conf directories
|
||||||
[ ! -d /etc/letsencrypt/config ] && {
|
mkdir -p /etc/letsencrypt/{config,live,renewal}
|
||||||
mkdir -p /etc/letsencrypt/config
|
|
||||||
}
|
|
||||||
[ ! -d /etc/letsencrypt/live ] && {
|
|
||||||
mkdir -p /etc/letsencrypt/live
|
|
||||||
}
|
|
||||||
[ ! -d /etc/letsencrypt/renewal ] && {
|
|
||||||
mkdir -p /etc/letsencrypt/renewal
|
|
||||||
}
|
|
||||||
# install acme.sh
|
# install acme.sh
|
||||||
./acme.sh --install \
|
./acme.sh --install \
|
||||||
--home /etc/letsencrypt \
|
--home /etc/letsencrypt \
|
||||||
|
|||||||
@@ -787,6 +787,11 @@ class WOStackController(CementBaseController):
|
|||||||
"/etc/php/7.2/fpm/pool.d/www.conf")
|
"/etc/php/7.2/fpm/pool.d/www.conf")
|
||||||
config.write(configfile)
|
config.write(configfile)
|
||||||
|
|
||||||
|
with open("/etc/php/7.2/fpm/pool.d/www.conf",
|
||||||
|
encoding='utf-8', mode='a') as myfile:
|
||||||
|
myfile.write("\nphp_admin_value[open_basedir] "
|
||||||
|
"= \"/var/www:/tmp/:/var/run/nginx-cache\"\n")
|
||||||
|
|
||||||
# Generate /etc/php/7.2/fpm/pool.d/www-two.conf
|
# Generate /etc/php/7.2/fpm/pool.d/www-two.conf
|
||||||
WOFileUtils.copyfile(self, "/etc/php/7.2/fpm/pool.d/www.conf",
|
WOFileUtils.copyfile(self, "/etc/php/7.2/fpm/pool.d/www.conf",
|
||||||
"/etc/php/7.2/fpm/pool.d/www-two.conf")
|
"/etc/php/7.2/fpm/pool.d/www-two.conf")
|
||||||
@@ -942,6 +947,11 @@ class WOStackController(CementBaseController):
|
|||||||
"/etc/php/7.3/fpm/pool.d/www.conf")
|
"/etc/php/7.3/fpm/pool.d/www.conf")
|
||||||
config.write(configfile)
|
config.write(configfile)
|
||||||
|
|
||||||
|
with open("/etc/php/7.3/fpm/pool.d/www.conf",
|
||||||
|
encoding='utf-8', mode='a') as myfile:
|
||||||
|
myfile.write("\nphp_admin_value[open_basedir] "
|
||||||
|
"= \"/var/www:/tmp/:/var/run/nginx-cache\"\n")
|
||||||
|
|
||||||
# Generate /etc/php/7.3/fpm/pool.d/www-two.conf
|
# Generate /etc/php/7.3/fpm/pool.d/www-two.conf
|
||||||
WOFileUtils.copyfile(self, "/etc/php/7.3/fpm/pool.d/www.conf",
|
WOFileUtils.copyfile(self, "/etc/php/7.3/fpm/pool.d/www.conf",
|
||||||
"/etc/php/7.3/fpm/pool.d/www-two.conf")
|
"/etc/php/7.3/fpm/pool.d/www-two.conf")
|
||||||
@@ -1081,7 +1091,8 @@ class WOStackController(CementBaseController):
|
|||||||
|
|
||||||
if any('/var/lib/wo/tmp/pma.tar.gz' == x[1]
|
if any('/var/lib/wo/tmp/pma.tar.gz' == x[1]
|
||||||
for x in packages):
|
for x in packages):
|
||||||
WOExtract.extract(self, '/var/lib/wo/tmp/pma.tar.gz', '/var/lib/wo/tmp/')
|
WOExtract.extract(
|
||||||
|
self, '/var/lib/wo/tmp/pma.tar.gz', '/var/lib/wo/tmp/')
|
||||||
Log.debug(self, 'Extracting file /var/lib/wo/tmp/pma.tar.gz to '
|
Log.debug(self, 'Extracting file /var/lib/wo/tmp/pma.tar.gz to '
|
||||||
'location /var/lib/wo/tmp/')
|
'location /var/lib/wo/tmp/')
|
||||||
if not os.path.exists('{0}22222/htdocs/db'
|
if not os.path.exists('{0}22222/htdocs/db'
|
||||||
@@ -1252,7 +1263,8 @@ class WOStackController(CementBaseController):
|
|||||||
for x in packages):
|
for x in packages):
|
||||||
Log.debug(self, "Extracting file webgrind.tar.gz to "
|
Log.debug(self, "Extracting file webgrind.tar.gz to "
|
||||||
"location /var/lib/wo/tmp/ ")
|
"location /var/lib/wo/tmp/ ")
|
||||||
WOExtract.extract(self, '/var/lib/wo/tmp/webgrind.tar.gz', '/var/lib/wo/tmp/')
|
WOExtract.extract(
|
||||||
|
self, '/var/lib/wo/tmp/webgrind.tar.gz', '/var/lib/wo/tmp/')
|
||||||
if not os.path.exists('{0}22222/htdocs/php'
|
if not os.path.exists('{0}22222/htdocs/php'
|
||||||
.format(WOVariables.wo_webroot)):
|
.format(WOVariables.wo_webroot)):
|
||||||
Log.debug(self, "Creating directroy "
|
Log.debug(self, "Creating directroy "
|
||||||
@@ -1294,7 +1306,8 @@ class WOStackController(CementBaseController):
|
|||||||
for x in packages):
|
for x in packages):
|
||||||
Log.debug(self, "Extracting file anemometer.tar.gz to "
|
Log.debug(self, "Extracting file anemometer.tar.gz to "
|
||||||
"location /var/lib/wo/tmp/ ")
|
"location /var/lib/wo/tmp/ ")
|
||||||
WOExtract.extract(self, '/var/lib/wo/tmp/anemometer.tar.gz', '/var/lib/wo/tmp/')
|
WOExtract.extract(
|
||||||
|
self, '/var/lib/wo/tmp/anemometer.tar.gz', '/var/lib/wo/tmp/')
|
||||||
if not os.path.exists('{0}22222/htdocs/db/'
|
if not os.path.exists('{0}22222/htdocs/db/'
|
||||||
.format(WOVariables.wo_webroot)):
|
.format(WOVariables.wo_webroot)):
|
||||||
Log.debug(self, "Creating directory")
|
Log.debug(self, "Creating directory")
|
||||||
|
|||||||
Reference in New Issue
Block a user