FreeBSD: set correct env vars

apache/files/FreeBSD/envvars-2.4.jinja

@@ -5,48 +5,14 @@
 # this won't be correct after changing uid
 unset HOME
 
-# for supporting multiple apache2 instances
-if [ "${APACHE_CONFDIR##/etc/apache2-}" != "${APACHE_CONFDIR}" ] ; then
-  SUFFIX="-${APACHE_CONFDIR##/etc/apache2-}"
-else
-  SUFFIX=
-fi
+APACHE_CONFDIR=/usr/local/etc/apache24
 
-# Since there is no sane way to get the parsed apache2 config in scripts, some
-# settings are defined via environment variables and then used in apache2ctl,
-# /etc/init.d/apache2, /etc/logrotate.d/apache2, etc.
-export APACHE_RUN_USER={{ salt['pillar.get']('apache:user', 'www-data') }}
-export APACHE_RUN_GROUP={{ salt['pillar.get']('apache:group', 'www-data') }}
-# temporary state file location. This might be changed to /run in Wheezy+1
-export APACHE_PID_FILE=/var/run/apache2/apache2$SUFFIX.pid
-export APACHE_RUN_DIR=/var/run/apache2$SUFFIX
-export APACHE_LOCK_DIR=/var/lock/apache2$SUFFIX
-# Only /var/log/apache2 is handled by /etc/logrotate.d/apache2.
-export APACHE_LOG_DIR=/var/log/apache2$SUFFIX
+export APACHE_RUN_USER={{ salt['pillar.get']('apache:user', 'www') }}
+export APACHE_RUN_GROUP={{ salt['pillar.get']('apache:group', 'www') }}
+export APACHE_RUN_DIR={{ salt['pillar.get']('apache:run_dir', '/var/run') }}
 
 ## The locale used by some modules like mod_dav
-export LANG=C
-## Uncomment the following line to use the system default locale instead:
-#. /etc/default/locale
-
-export LANG
-
-## The command to get the status for 'apache2ctl status'.
-## Some packages providing 'www-browser' need '--dump' instead of '-dump'.
-#export APACHE_LYNX='www-browser -dump'
-
-## If you need a higher file descriptor limit, uncomment and adjust the
-## following line (default is 8192):
-#APACHE_ULIMIT_MAX_FILES='ulimit -n 65536'
-
-## If you would like to pass arguments to the web server, add them below
-## to the APACHE_ARGUMENTS environment.
-#export APACHE_ARGUMENTS=''
-
-## Enable the debug mode for maintainer scripts.
-## This will produce a verbose output on package installations of web server modules and web application
-## installations which interact with Apache
-#export APACHE2_MAINTSCRIPT_DEBUG=1
+export LANG=en_US.UTF-8
 
 {%- for envvar in salt['pillar.get']('apache:envvars', []) %}
 {{ envvar }}