summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstartxfr <clarue@startx.fr>2016-06-12 10:45:18 +0200
committerstartxfr <clarue@startx.fr>2016-06-12 10:45:18 +0200
commit53edd82909c6784c80f08ec739bd2e0995d7ce72 (patch)
treec50063b51e0d540746b02c5be6b81e35dcd1468c
parent944ab10bbc0bf47ab5b5a6571b07920d6f86dc18 (diff)
downloadphpmyadmin-53edd82909c6784c80f08ec739bd2e0995d7ce72.tar.gz
phpmyadmin-53edd82909c6784c80f08ec739bd2e0995d7ce72.tar.bz2
phpmyadmin-53edd82909c6784c80f08ec739bd2e0995d7ce72.tar.xz
phpmyadmin-53edd82909c6784c80f08ec739bd2e0995d7ce72.zip
change for config pma
-rw-r--r--Applications/phpmyadmin/test.php5
-rw-r--r--Services/apache/sx-httpd.sh19
-rw-r--r--Services/php/run.sh1
3 files changed, 23 insertions, 2 deletions
diff --git a/Applications/phpmyadmin/test.php b/Applications/phpmyadmin/test.php
index a7796a0..2cb53e7 100644
--- a/Applications/phpmyadmin/test.php
+++ b/Applications/phpmyadmin/test.php
@@ -1,4 +1,5 @@
<?php
-print_r($_SERVER);
-print_r($_ENV);
+var_dump($_SERVER);
+var_dump($_ENV);
+var_dump(getenv('MARIADB_ENV_MYSQL_USER'));
?>
diff --git a/Services/apache/sx-httpd.sh b/Services/apache/sx-httpd.sh
index 707b16d..b404dd6 100644
--- a/Services/apache/sx-httpd.sh
+++ b/Services/apache/sx-httpd.sh
@@ -75,3 +75,22 @@ function start_service_httpd {
tail -f /dev/null & wait ${!}
done
}
+
+
+
+# set env var $2 (val $3) in file $1
+function setEnvironmentVariableInFile {
+ if [ -z "$3" ]; then
+ echo "Environment variable '$2' not set."
+ return
+ fi
+ echo "SetEnv $2 $3" >> $1
+}
+
+
+function setSys2HttpEnvironmentVariable {
+ echo "" >> $1
+ for _curVar in `env | awk -F = '{print $1}'`;do
+ setEnvironmentVariableInFile $1 ${_curVar} ${!_curVar}
+ done
+} \ No newline at end of file
diff --git a/Services/php/run.sh b/Services/php/run.sh
index 0935290..e3c4c86 100644
--- a/Services/php/run.sh
+++ b/Services/php/run.sh
@@ -30,5 +30,6 @@ function display_container_php_header {
}
check_httpd_environment | tee -a $STARTUPLOG
+setSys2HttpEnvironmentVariable $APP_PATH/.htaccess
display_container_php_header | tee -a $STARTUPLOG
start_service_httpd