Skip to content

Commit f081703

Browse files
committed
Fix APP_ROOT variable name that got broken during previous commit
1 parent b5f24ab commit f081703

File tree

3 files changed

+9
-9
lines changed
  • 5.6/root/usr/share/container-scripts/php
  • 7.0/root/usr/share/container-scripts/php
  • 7.1/root/usr/share/container-scripts/php

3 files changed

+9
-9
lines changed

5.6/root/usr/share/container-scripts/php/common.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,9 @@ process_ssl_certs() {
119119
local dir=${1:-.}
120120
if [ -d ${dir}/httpd-ssl/private ] && [ -d ${dir}/httpd-ssl/certs ]; then
121121
echo "---> Looking for SSL certs for httpd..."
122-
cp -r ${dir}/httpd-ssl ${HTTPD_APP_ROOT}
123-
local ssl_cert="$(ls -A ${HTTPD_APP_ROOT}/httpd-ssl/certs/*.pem | head -n 1)"
124-
local ssl_private="$(ls -A ${HTTPD_APP_ROOT}/httpd-ssl/private/*.pem | head -n 1)"
122+
cp -r ${dir}/httpd-ssl ${APP_ROOT}
123+
local ssl_cert="$(ls -A ${APP_ROOT}/httpd-ssl/certs/*.pem | head -n 1)"
124+
local ssl_private="$(ls -A ${APP_ROOT}/httpd-ssl/private/*.pem | head -n 1)"
125125
if [ -f "${ssl_cert}" ] ; then
126126
# do sed for SSLCertificateFile and SSLCertificateKeyFile
127127
echo "---> Setting SSL cert file for httpd..."

7.0/root/usr/share/container-scripts/php/common.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,9 @@ process_ssl_certs() {
119119
local dir=${1:-.}
120120
if [ -d ${dir}/httpd-ssl/private ] && [ -d ${dir}/httpd-ssl/certs ]; then
121121
echo "---> Looking for SSL certs for httpd..."
122-
cp -r ${dir}/httpd-ssl ${HTTPD_APP_ROOT}
123-
local ssl_cert="$(ls -A ${HTTPD_APP_ROOT}/httpd-ssl/certs/*.pem | head -n 1)"
124-
local ssl_private="$(ls -A ${HTTPD_APP_ROOT}/httpd-ssl/private/*.pem | head -n 1)"
122+
cp -r ${dir}/httpd-ssl ${APP_ROOT}
123+
local ssl_cert="$(ls -A ${APP_ROOT}/httpd-ssl/certs/*.pem | head -n 1)"
124+
local ssl_private="$(ls -A ${APP_ROOT}/httpd-ssl/private/*.pem | head -n 1)"
125125
if [ -f "${ssl_cert}" ] ; then
126126
# do sed for SSLCertificateFile and SSLCertificateKeyFile
127127
echo "---> Setting SSL cert file for httpd..."

7.1/root/usr/share/container-scripts/php/common.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,9 @@ process_ssl_certs() {
119119
local dir=${1:-.}
120120
if [ -d ${dir}/httpd-ssl/private ] && [ -d ${dir}/httpd-ssl/certs ]; then
121121
echo "---> Looking for SSL certs for httpd..."
122-
cp -r ${dir}/httpd-ssl ${HTTPD_APP_ROOT}
123-
local ssl_cert="$(ls -A ${HTTPD_APP_ROOT}/httpd-ssl/certs/*.pem | head -n 1)"
124-
local ssl_private="$(ls -A ${HTTPD_APP_ROOT}/httpd-ssl/private/*.pem | head -n 1)"
122+
cp -r ${dir}/httpd-ssl ${APP_ROOT}
123+
local ssl_cert="$(ls -A ${APP_ROOT}/httpd-ssl/certs/*.pem | head -n 1)"
124+
local ssl_private="$(ls -A ${APP_ROOT}/httpd-ssl/private/*.pem | head -n 1)"
125125
if [ -f "${ssl_cert}" ] ; then
126126
# do sed for SSLCertificateFile and SSLCertificateKeyFile
127127
echo "---> Setting SSL cert file for httpd..."

0 commit comments

Comments
 (0)