removed httpd_configuration_envvars.

ansiblebit · Oct 6, 2016 · 892605e · 892605e
1 parent 8590747
commit 892605e
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 100 deletions.
diff --git a/tests/vars/travis.yml b/tests/vars/travis.yml
@@ -199,56 +199,6 @@ httpd_conf:
       </IfModule>
 
 
-httpd_configuration_envvars: |
-  # envvars - default environment variables for apache2ctl
-
-  # 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
-
-  # 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=www-data
-  export APACHE_RUN_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
-
-  ## 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
-
-
 httpd_default: |
   ### htcacheclean settings ###
 

diff --git a/tests/vars/vagrant.yml b/tests/vars/vagrant.yml
@@ -364,56 +364,6 @@ httpd_configuration: |
   # Include the virtual host configurations:
   IncludeOptional sites-enabled/*.conf
 
-
-httpd_configuration_envvars: |
-  # envvars - default environment variables for apache2ctl
-
-  # 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
-
-  # 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=www-data
-  export APACHE_RUN_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
-
-  ## 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
-
 httpd_default: |
   ### htcacheclean settings ###