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

Commit 382038e

Browse files
authored
Merge pull request #241 from jdeathe/issue/237
CLOSES #237: Adds config file replacement for DBGP_IDEKEY.
2 parents 5918264 + e0be05f commit 382038e

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
### 1.13.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
### 1.13.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}"
@@ -1719,6 +1724,7 @@ function main ()
17191724
local apache_ssl_protocol
17201725
local apache_system_user
17211726
local config_files
1727+
local dbgp_idekey
17221728
local details_modules_enabled_list
17231729
local details_ssl_certificate_fingerprint
17241730
local document_root
@@ -1815,6 +1821,9 @@ function main ()
18151821
apache_system_user="$(
18161822
__get_apache_system_user
18171823
)"
1824+
dbgp_idekey="$(
1825+
__get_dbgp_idekey
1826+
)"
18181827
php_options_date_timezone="$(
18191828
__get_php_options_date_timezone
18201829
)"
@@ -1966,6 +1975,7 @@ function main ()
19661975
-e "s~(\\$\{|\{\{)APACHE_SSL_CIPHER_SUITE(\}\}|(:-.+)?\})~${apache_ssl_cipher_suite}~g" \
19671976
-e "s~(\\$\{|\{\{)APACHE_SSL_PROTOCOL(\}\}|(:-.+)?\})~${apache_ssl_protocol}~g" \
19681977
-e "s~(\\$\{|\{\{)APACHE_SYSTEM_USER(\}\}|(:-.+)?\})~${apache_system_user}~g" \
1978+
-e "s~(\\$\{|\{\{)DBGP_IDEKEY(\}\}|(:-.+)?\})~${dbgp_idekey}~g" \
19691979
-e "s~(\\$\{|\{\{)PACKAGE_PATH(\}\}|(:-.+)?\})~${package_path}~g" \
19701980
-e "s~(\\$\{|\{\{)PHP_OPTIONS_DATE_TIMEZONE(\}\}|(:-.+)?\})~${php_options_date_timezone}~g" \
19711981
-e "s~(\\$\{|\{\{)PHP_OPTIONS_SESSION_NAME(\}\}|(:-.+)?\})~${php_options_session_name}~g" \

0 commit comments

Comments
 (0)