Skip to content
This repository was archived by the owner on Jul 2, 2024. It is now read-only.

Commit c9cdaa6

Browse files
authored
Merge pull request #240 from jdeathe/issue/235
CLOSES #235: Adds config file replacement for DBGP_IDEKEY.
2 parents b15a3d9 + fed4e28 commit c9cdaa6

File tree

2 files changed

+11
-0
lines changed

2 files changed

+11
-0
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Summary of release changes.
77
### 2.2.2 - Unreleased
88

99
- Adds PHP 5 applicable session settings into service configuration.
10+
- Adds configuration file replacement of placeholders for Xdebug's `DBGP_IDEKEY`.
1011

1112
### 2.2.1 - 2019-07-28
1213

src/usr/sbin/httpd-bootstrap

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -686,6 +686,11 @@ function __get_apache_server_version ()
686686
printf -- '%s' "${semantic_version}"
687687
}
688688

689+
function __get_dbgp_idekey ()
690+
{
691+
printf -- '%s' "${DBGP_IDEKEY}"
692+
}
693+
689694
function __get_details_ssl_certificate_fingerprint ()
690695
{
691696
local -r digest="${1:-sha1}"
@@ -1725,6 +1730,7 @@ function main ()
17251730
local apache_ssl_protocol
17261731
local apache_system_user
17271732
local config_files
1733+
local dbgp_idekey
17281734
local details_modules_enabled_list
17291735
local details_ssl_certificate_fingerprint
17301736
local document_root
@@ -1821,6 +1827,9 @@ function main ()
18211827
apache_system_user="$(
18221828
__get_apache_system_user
18231829
)"
1830+
dbgp_idekey="$(
1831+
__get_dbgp_idekey
1832+
)"
18241833
php_options_date_timezone="$(
18251834
__get_php_options_date_timezone
18261835
)"
@@ -1972,6 +1981,7 @@ function main ()
19721981
-e "s~(\\$\{|\{\{)APACHE_SSL_CIPHER_SUITE(\}\}|(:-.+)?\})~${apache_ssl_cipher_suite}~g" \
19731982
-e "s~(\\$\{|\{\{)APACHE_SSL_PROTOCOL(\}\}|(:-.+)?\})~${apache_ssl_protocol}~g" \
19741983
-e "s~(\\$\{|\{\{)APACHE_SYSTEM_USER(\}\}|(:-.+)?\})~${apache_system_user}~g" \
1984+
-e "s~(\\$\{|\{\{)DBGP_IDEKEY(\}\}|(:-.+)?\})~${dbgp_idekey}~g" \
19751985
-e "s~(\\$\{|\{\{)PACKAGE_PATH(\}\}|(:-.+)?\})~${package_path}~g" \
19761986
-e "s~(\\$\{|\{\{)PHP_OPTIONS_DATE_TIMEZONE(\}\}|(:-.+)?\})~${php_options_date_timezone}~g" \
19771987
-e "s~(\\$\{|\{\{)PHP_OPTIONS_SESSION_NAME(\}\}|(:-.+)?\})~${php_options_session_name}~g" \

0 commit comments

Comments
 (0)