Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fixed debian webserver conf

Browse source
This commit is contained in:
André Bauer 2017-06-24 10:43:01 +02:00
parent 306cd6c3db
commit 52baed55f8
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
contrib/packager.io/functions
View file

@ -79,7 +79,7 @@ function detect_webserver () {
WEBSERVER="nginx" WEBSERVER="nginx"
WEBSERVER_CMD="nginx" WEBSERVER_CMD="nginx"
if [ "${OS}" == "DEBIAN" ]; then if [ "${OS}" == "DEBIAN" ]; then
WEBSERVER_CONF="/etc/nginx/sites-enabled/zammad.conf" WEBSERVER_CONF="/etc/nginx/sites-available/zammad.conf"
elif [ "${OS}" == "REDHAT" ]; then elif [ "${OS}" == "REDHAT" ]; then
WEBSERVER_CONF="/etc/nginx/conf.d/zammad.conf" WEBSERVER_CONF="/etc/nginx/conf.d/zammad.conf"
elif [ "${OS}" == "SUSE" ]; then elif [ "${OS}" == "SUSE" ]; then
@ -89,7 +89,7 @@ function detect_webserver () {
WEBSERVER="apache2" WEBSERVER="apache2"
WEBSERVER_CMD="apache2" WEBSERVER_CMD="apache2"
if [ "${OS}" == "DEBIAN" ]; then if [ "${OS}" == "DEBIAN" ]; then
WEBSERVER_CONF="/etc/apache2/sites-enabled/zammad.conf" WEBSERVER_CONF="/etc/apache2/sites-available/zammad.conf"
fi fi
elif [ -n "$(which httpd 2> /dev/null)" ]; then elif [ -n "$(which httpd 2> /dev/null)" ]; then
WEBSERVER="apache2" WEBSERVER="apache2"
@ -195,8 +195,10 @@ function update_database () {
function create_webserver_config () { function create_webserver_config () {
if [ "${OS}" == "DEBIAN" ]; then if [ "${OS}" == "DEBIAN" ]; then
test -f /etc/${WEBSERVER}/sites-available/zammad.conf || cp ${ZAMMAD_DIR}/contrib/${WEBSERVER}/zammad.conf /etc/${WEBSERVER}/sites-available/zammad.conf if [ ! -f "${WEBSERVER_CONF}" ]; then
test -h ${WEBSERVER_CONF} || ln -s /etc/${WEBSERVER}/sites-available/zammad.conf ${WEBSERVER_CONF} cp ${ZAMMAD_DIR}/contrib/${WEBSERVER}/zammad.conf ${WEBSERVER_CONF}
ln -s ${WEBSERVER_CONF} /etc/${WEBSERVER}/sites-enabled/zammad.conf
fi
if [ "${WEBSERVER}" == "apache2" ]; then if [ "${WEBSERVER}" == "apache2" ]; then
a2enmod proxy a2enmod proxy
a2enmod proxy_http a2enmod proxy_http