modules
/
nutools
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

module apache: ajout de HTDOCSBASE pour le déploiement multi-homé

This commit is contained in:
Jephté Clain 2016-06-23 06:52:29 +04:00
parent 75654610f7
commit dcf0e613e1
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/ulib/apache
View File

@ -135,6 +135,14 @@ function get_default_apachesitesdir_prefix() {
fi fi
} }
function get_default_htdocsbase_prefix() {
if check_sysinfos -s darwin; then
__apache_prefixes_checkdir /Library/WebServer/Documents
elif check_sysinfos -s linux; then
__apache_prefixes_checkdir /var/www
fi
}
function get_default_htdocsdir_prefix() { function get_default_htdocsdir_prefix() {
if check_sysinfos -s darwin; then if check_sysinfos -s darwin; then
__apache_prefixes_checkdir /Library/WebServer/Documents __apache_prefixes_checkdir /Library/WebServer/Documents
@ -178,12 +186,13 @@ function __compute_apache_prefixes() {
APACHECONF="${APACHECONF:-$(get_default_apacheconf_prefix)}" APACHECONF="${APACHECONF:-$(get_default_apacheconf_prefix)}"
APACHEAVSITESDIR="${APACHEAVSITESDIR:-$(get_default_apacheavsitesdir_prefix)}" APACHEAVSITESDIR="${APACHEAVSITESDIR:-$(get_default_apacheavsitesdir_prefix)}"
APACHESITESDIR="${APACHESITESDIR:-$(get_default_apachesitesdir_prefix)}" APACHESITESDIR="${APACHESITESDIR:-$(get_default_apachesitesdir_prefix)}"
HTDOCSBASE="${HTDOCSBASE:-$(get_default_htdocsbase_prefix)}"
HTDOCSDIR="${HTDOCSDIR:-$(get_default_htdocsdir_prefix)}" HTDOCSDIR="${HTDOCSDIR:-$(get_default_htdocsdir_prefix)}"
CGIBINDIR="${CGIBINDIR:-$(get_default_cgibindir_prefix)}" CGIBINDIR="${CGIBINDIR:-$(get_default_cgibindir_prefix)}"
__apache_prefixes=1 __apache_prefixes=1
} }
APACHE_PREFIXES=(APACHEBIN APACHEVERSION APACHECTL APACHELOGDIR APACHESSLCERTSDIR APACHESSLKEYSDIR APACHECONFDIR APACHECONF APACHEAVSITESDIR APACHESITESDIR HTDOCSDIR CGIBINDIR) APACHE_PREFIXES=(APACHEBIN APACHEVERSION APACHECTL APACHELOGDIR APACHESSLCERTSDIR APACHESSLKEYSDIR APACHECONFDIR APACHECONF APACHEAVSITESDIR APACHESITESDIR HTDOCSBASE HTDOCSDIR CGIBINDIR)
UTOOLS_PREFIXES=("${UTOOLS_PREFIXES[@]}" "${APACHE_PREFIXES[@]}") UTOOLS_PREFIXES=("${UTOOLS_PREFIXES[@]}" "${APACHE_PREFIXES[@]}")
function compute_apache_prefixes() { function compute_apache_prefixes() {
@ -249,6 +258,11 @@ function get_APACHESITESDIR_prefix() {
echo "$APACHESITESDIR" echo "$APACHESITESDIR"
} }
function get_HTDOCSBASE_prefix() {
__compute_apache_prefixes
echo "$HTDOCSBASE"
}
function get_HTDOCSDIR_prefix() { function get_HTDOCSDIR_prefix() {
__compute_apache_prefixes __compute_apache_prefixes
echo "$HTDOCSDIR" echo "$HTDOCSDIR"