Fixing issues

limatheus · Jul 24, 2015 · b377788 · b377788
1 parent 5a186c4
commit b377788
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 3 deletions.
diff --git a/.openshift/markers/use_composer b/.openshift/markers/use_composer
diff --git a/config/httpd.conf → conf/httpd.conf b/config/httpd.conf → conf/httpd.conf
@@ -71,7 +71,7 @@ LoadModule version_module modules/mod_version.so
 #SetEnv OPENSHIFT_RUNTIME_DIR ${OPENSHIFT_HOMEDIR}/app-root/runtime
 #SetEnv PATH ${OPENSHIFT_RUNTIME_DIR}:${PATH}
 
-Include ${OPENSHIFT_REPO_DIR}/config/httpd/*.conf
+Include ${OPENSHIFT_REPO_DIR}/conf/httpd/*.conf
 Include ${OPENSHIFT_TMP_DIR}/httpd_temp.conf
 
 ServerAdmin root@localhost

diff --git a/config/httpd/README → conf/httpd/README b/config/httpd/README → conf/httpd/README
diff --git a/config/php/php.ini → conf/php/php.ini b/config/php/php.ini → conf/php/php.ini
diff --git a/misc/common.sh b/misc/common.sh
@@ -2,7 +2,7 @@
 # This shell script will run before httpd starts.
 # You can also change HTTPD_ARGUMENT to append something interesting.
 
-export HTTPD_ARGUMENT="-f ${OPENSHIFT_REPO_DIR}/config/httpd.conf"
+export HTTPD_ARGUMENT="-f ${OPENSHIFT_REPO_DIR}/conf/httpd.conf"
 
 export OPENSHIFT_RUNTIME_DIR=${OPENSHIFT_HOMEDIR}/app-root/runtime
 

diff --git a/misc/make.sh b/misc/make.sh
@@ -9,7 +9,7 @@
 export OPENSHIFT_RUNTIME_DIR=${OPENSHIFT_HOMEDIR}/app-root/runtime
 export ROOT_DIR=${OPENSHIFT_RUNTIME_DIR}	#CARTRIDGE
 export LIB_DIR=${ROOT_DIR}/lib
-export CONF_DIR=${OPENSHIFT_REPO_DIR}/config
+export CONF_DIR=${OPENSHIFT_REPO_DIR}/conf
 
 export DIST_PHP_VER=5.6.11