Drop vserver support

diff --git a/files/envvars.vserver.jessie b/files/envvars.vserver.jessie
deleted file mode 100644 (file)
index 8ab7097..0000000
--- a/files/envvars.vserver.jessie
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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:
-## We need a custom envvars apache config to set correct LANG env, see
-## https://projects.puppetlabs.com/issues/11303
-## https://projects.puppetlabs.com/issues/11860
-. /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'
-
-# Can't ulimit inside a vserver, so we avoid noise output at logrotate's cronjob
-APACHE_ULIMIT_MAX_FILES=''
-
-## 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

diff --git a/files/envvars.vserver.wheezy b/files/envvars.vserver.wheezy
deleted file mode 100644 (file)
index 992af0c..0000000
--- a/files/envvars.vserver.wheezy
+++ /dev/null
@@ -1,48 +0,0 @@
-# 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
-export APACHE_PID_FILE=/var/run/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:
-## Uncomment the following line to use the system default locale instead:
-## We need a custom envvars apache config to set correct LANG env, see
-## https://projects.puppetlabs.com/issues/11303
-## https://projects.puppetlabs.com/issues/11860
-. /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'
-
-# Can't ulimit inside a vserver, so we avoid noise output at logrotate's cronjob
-APACHE_ULIMIT_MAX_FILES=''
-
-## If you would like to pass arguments to the web server, add them below
-## to the APACHE_ARGUMENTS environment.
-#export APACHE_ARGUMENTS=''

diff --git a/files/logrotate b/files/logrotate
deleted file mode 100644 (file)
index 7c71488..0000000
--- a/files/logrotate
+++ /dev/null
@@ -1,18 +0,0 @@
-/var/log/apache2/*.log {
-       weekly
-       missingok
-       rotate 52
-       compress
-       delaycompress
-       notifempty
-       create 640 root adm
-       sharedscripts
-       postrotate
-               /etc/init.d/apache2 reload &> /dev/null
-       endscript
-       prerotate
-               if [ -d /etc/logrotate.d/httpd-prerotate ]; then \
-                       run-parts /etc/logrotate.d/httpd-prerotate; \
-               fi; \
-       endscript
-}

diff --git a/manifests/init.pp b/manifests/init.pp
index 6c1240530c236fdc66c415d9faf2a21a52cf28a3..aa56585a21ac169640e35b6c1fe1ca7819ec7c4d 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -265,24 +265,8 @@ class apache(
     refreshonly => true,
   }
 
-  # Avoid this logrotate error:
-  # /usr/sbin/apache2ctl: 87: ulimit: error setting limit (Operation not permitted)
-  file { '/etc/logrotate.d/apache2':
-    ensure => present,
-    owner  => root,
-    group  => root,
-    mode   => 0644,
-    source => $::virtual ? {
-      'vserver' => 'puppet:///modules/apache/logrotate',
-      default   => undef,
-    },
-  }
-
   class { 'apache::envvars':
-    source  => $::virtual ? {
-      'vserver' => "puppet:///modules/apache/envvars.vserver.${::lsbdistcodename}",
-      default   => "puppet:///modules/apache/envvars.${::lsbdistcodename}",
-    },
+    source => "puppet:///modules/apache/envvars.${::lsbdistcodename}",
   }
 
   # Legacy configuration