[gentoo-commits] repo/gentoo:master commit in: app-backup/backuppc/files/3.2.0/, app-backup/backuppc/files/

[Kent Fredric]

commit:     942c161389f49f41ce3d1390f06b806cbd9976aa
Author:     Kent Fredric <kentnl <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  1 19:17:47 2017 +0000
Commit:     Kent Fredric <kentnl <AT> gentoo <DOT> org>
CommitDate: Wed Feb  1 22:21:49 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=942c1613

app-backup/backuppc: Remove unused patches

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../backuppc/files/3.2.0/01-fix-configure.pl.patch |  30 --
 .../3.2.0/03-reasonable-config.pl-defaults.patch   |  47 ---
 app-backup/backuppc/files/apache2-backuppc.conf    |  73 -----
 app-backup/backuppc/files/apache2-backuppc.init    | 170 -----------
 app-backup/backuppc/files/httpd.conf               | 332 ---------------------
 5 files changed, 652 deletions(-)

diff --git a/app-backup/backuppc/files/3.2.0/01-fix-configure.pl.patch b/app-backup/backuppc/files/3.2.0/01-fix-configure.pl.patch
deleted file mode 100644
index 060cf95..00000000
--- a/app-backup/backuppc/files/3.2.0/01-fix-configure.pl.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- configure.pl.orig	2010-07-31 20:52:58.000000000 +0300
-+++ configure.pl	2010-09-03 22:09:46.437788435 +0300
-@@ -158,7 +158,7 @@
- # config file to get all the defaults.
- #
- my $ConfigPath = "";
--my $ConfigFileOK = 1;
-+my $ConfigFileOK = 0;
- while ( 1 ) {
-     if ( $ConfigFileOK && -f "/etc/BackupPC/config.pl" ) {
-         $ConfigPath = "/etc/BackupPC/config.pl";
-@@ -213,7 +213,8 @@
-         $bpc->{LogDir} = $Conf{LogDir}  = "$Conf{TopDir}/log"
-                     if ( $Conf{LogDir} eq '' );
-     }
--    $bpc->{ConfDir} = $Conf{ConfDir} = $confDir;
-+    # Disable this as it's not really neccessary for this ebuild
-+    # $bpc->{ConfDir} = $Conf{ConfDir} = $confDir;
-     my $err = $bpc->ServerConnect($Conf{ServerHost}, $Conf{ServerPort}, 1);
-     if ( $err eq "" ) {
-         print <<EOF;
-@@ -726,7 +727,7 @@
-     if ( $Conf{CgiDir} =~ m{cgi-bin(/.*)} ) {
- 	$Conf{CgiURL} = "'http://$Conf{ServerHost}/cgi-bin$1/BackupPC_Admin'";
-     } else {
--	$Conf{CgiURL} = "'http://$Conf{ServerHost}/cgi-bin/BackupPC_Admin'";
-+	$Conf{CgiURL} = "'http://$Conf{ServerHost}/BackupPC_Admin'";
-     }
- }
- 

diff --git a/app-backup/backuppc/files/3.2.0/03-reasonable-config.pl-defaults.patch b/app-backup/backuppc/files/3.2.0/03-reasonable-config.pl-defaults.patch
deleted file mode 100644
index 06075f9..00000000
--- a/app-backup/backuppc/files/3.2.0/03-reasonable-config.pl-defaults.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- conf/config.pl.formatted	2010-09-03 23:09:13.035788559 +0300
-+++ conf/config.pl	2010-09-03 23:10:19.314788450 +0300
-@@ -1319,6 +1319,8 @@
-   '--times',
-   '--block-size=2048',
-   '--recursive',
-+  '--specials',
-+  '--checksum-seed=32761',
- ];
- 
- #
-@@ -1385,6 +1387,8 @@
-   '--relative',
-   '--ignore-times',
-   '--recursive',
-+  '--specials',
-+  '--checksum-seed=32761',
- ];
- 
- ###########################################################################
-@@ -2015,7 +2019,7 @@
- #    --> administrative users are only craig and celia'.
- #
- $Conf{CgiAdminUserGroup} = '';
--$Conf{CgiAdminUsers}     = '';
-+$Conf{CgiAdminUsers}     = 'backuppc';
- 
- #
- # URL of the BackupPC_Admin CGI script.  Used for email messages.
-@@ -2062,7 +2066,7 @@
- # dates (MM/DD), a value of 2 uses full YYYY-MM-DD format, and zero
- # for international dates (DD/MM).
- #
--$Conf{CgiDateFormatMMDD} = 1;
-+$Conf{CgiDateFormatMMDD} = 2;
- 
- #
- # If set, the complete list of hosts appears in the left navigation
-@@ -2248,7 +2252,7 @@
-   ClientTimeout => 1,
-   MaxOldPerPCLogFiles => 1,
-   CompressLevel => 1,
--  ClientNameAlias => 1,
-+  ClientNameAlias => 0,
-   DumpPreUserCmd => 0,
-   DumpPostUserCmd => 0,
-   RestorePreUserCmd => 0,

diff --git a/app-backup/backuppc/files/apache2-backuppc.conf b/app-backup/backuppc/files/apache2-backuppc.conf
deleted file mode 100644
index 4df0b4e..00000000
--- a/app-backup/backuppc/files/apache2-backuppc.conf
+++ /dev/null
@@ -1,73 +0,0 @@
-# /etc/conf.d/apache2: config file for /etc/init.d/apache2
-
-# When you install a module it is easy to activate or deactivate the modules
-# and other features of apache using the APACHE2_OPTS line. Every module should
-# install a configuration in /etc/apache2/modules.d. In that file will have an
-# <IfDefine NNN> directive where NNN is the option to enable that module.
-#
-# Here are the options available in the default configuration:
-#
-#  AUTH_DIGEST  Enables mod_auth_digest
-#  AUTHNZ_LDAP  Enables authentication through mod_ldap (available if USE=ldap)
-#  CACHE        Enables mod_cache
-#  DAV          Enables mod_dav
-#  ERRORDOCS    Enables default error documents for many languages.
-#  INFO         Enables mod_info, a useful module for debugging
-#  LANGUAGE     Enables content-negotiation based on language and charset.
-#  LDAP         Enables mod_ldap (available if USE=ldap)
-#  MANUAL       Enables /manual/ to be the apache manual (available if USE=docs)
-#  MEM_CACHE    Enables default configuration mod_mem_cache
-#  PROXY        Enables mod_proxy
-#  SSL          Enables SSL (available if USE=ssl)
-#  SUEXEC       Enables running CGI scripts (in USERDIR) through suexec.
-#  USERDIR      Enables /~username mapping to /home/username/public_html
-#
-#
-# The following two options provide the default virtual host for the HTTP and
-# HTTPS protocol. YOU NEED TO ENABLE AT LEAST ONE OF THEM, otherwise apache
-# will not listen for incomming connections on the approriate port.
-#
-#  DEFAULT_VHOST      Enables name-based virtual hosts, with the default
-#                     virtual host being in /var/www/localhost/htdocs
-#  SSL_DEFAULT_VHOST  Enables default vhost for SSL (you should enable this
-#                     when you enable SSL)
-#
-APACHE2_OPTS="-D LANGUAGE -D PERL -D BACKUPPC_VHOST"
-
-# Extended options for advanced uses of Apache ONLY
-# You don't need to edit these unless you are doing crazy Apache stuff
-# As not having them set correctly, or feeding in an incorrect configuration
-# via them will result in Apache failing to start
-# YOU HAVE BEEN WARNED.
-
-# PID file
-PIDFILE=/var/run/apache-backuppc.pid
-
-# timeout for startup/shutdown checks
-#TIMEOUT=10
-
-# ServerRoot setting
-SERVERROOT=/usr/lib/apache2
-
-# Configuration file location
-# - If this does NOT start with a '/', then it is treated relative to
-# $SERVERROOT by Apache
-CONFIGFILE=/etc/BackupPC/httpd.conf
-
-# Location to log startup errors to
-# They are normally dumped to your terminal.
-#STARTUPERRORLOG="/var/log/apache2/startuperror.log"
-
-# A command that outputs a formatted text version of the HTML at the URL
-# of the command line. Designed for lynx, however other programs may work.
-#LYNX="lynx -dump"
-
-# The URL to your server's mod_status status page.
-# Required for status and fullstatus
-#STATUSURL="http://localhost/server-status"
-
-# Method to use when reloading the server
-# Valid options are 'restart' and 'graceful'
-# See https://httpd.apache.org/docs/2.2/stopping.html for information on
-# what they do and how they differ.
-#RELOAD_TYPE="graceful"

diff --git a/app-backup/backuppc/files/apache2-backuppc.init b/app-backup/backuppc/files/apache2-backuppc.init
deleted file mode 100644
index 77a8d89..00000000
--- a/app-backup/backuppc/files/apache2-backuppc.init
+++ /dev/null
@@ -1,170 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-opts="configdump configtest fullstatus graceful gracefulstop modules reload virtualhosts"
-
-depend() {
-	need net
-	use mysql dns logger netmount postgresql
-	after sshd
-}
-
-configtest() {
-	ebegin "Checking ${SVCNAME} configuration"
-	checkconfig
-	eend $?
-}
-
-checkconfd() {
-	PIDFILE="${PIDFILE:-/var/run/apache2-backuppc.pid}"
-	TIMEOUT=${TIMEOUT:-10}
-
-	SERVERROOT="${SERVERROOT:-/usr/lib/apache2}"
-	if [ ! -d ${SERVERROOT} ]; then
-		eerror "SERVERROOT does not exist: ${SERVERROOT}"
-		return 1
-	fi
-
-	CONFIGFILE="${CONFIGFILE:-/etc/BackupPC/httpd.conf}"
-	[ "${CONFIGFILE#/}" = "${CONFIGFILE}" ] && CONFIGFILE="${SERVERROOT}/${CONFIGFILE}"
-	if [ ! -r "${CONFIGFILE}" ]; then
-		eerror "Unable to read configuration file: ${CONFIGFILE}"
-		return 1
-	fi
-
-	APACHE2_OPTS="${APACHE2_OPTS} -d ${SERVERROOT}"
-	APACHE2_OPTS="${APACHE2_OPTS} -f ${CONFIGFILE}"
-	[ -n "${STARTUPERRORLOG}" ] && APACHE2_OPTS="${APACHE2_OPTS} -E ${STARTUPERRORLOG}"
-
-	APACHE2="/usr/sbin/apache2"
-}
-
-checkconfig() {
-	checkconfd || return 1
-
-	${APACHE2} ${APACHE2_OPTS} -t 1>/dev/null 2>&1
-	ret=$?
-	if [ $ret -ne 0 ]; then
-		eerror "${SVCNAME} has detected a syntax error in your configuration files:"
-		${APACHE2} ${APACHE2_OPTS} -t
-	fi
-
-	return $ret
-}
-
-start() {
-	checkconfig || return 1
-
-	[ -f /var/log/apache2/ssl_scache ] && rm /var/log/apache2/ssl_scache
-
-	ebegin "Starting ${SVCNAME}"
-	${APACHE2} ${APACHE2_OPTS} -k start
-
-	let i=0
-	while [ ! -e "${PIDFILE}" ] && [ $i -lt ${TIMEOUT} ]; do
-		sleep 1 && i=$(expr $i + 1)
-	done
-
-	test $i -le ${TIMEOUT}
-	eend $?
-}
-
-stop() {
-	checkconfd || return 1
-
-	ebegin "Stopping ${SVCNAME}"
-	${APACHE2} ${APACHE2_OPTS} -k stop
-
-	let i=0
-	while pidof "${APACHE2}" >/dev/null && [ $i -lt ${TIMEOUT} ]; do
-		sleep 1 && i=$(expr $i + 1)
-	done
-
-	test $i -le ${TIMEOUT}
-	eend $?
-}
-
-reload() {
-	RELOAD_TYPE="${RELOAD_TYPE:-graceful}"
-
-	checkconfig || return 1
-	service_started "${SVCNAME}" || return
-
-	if [ "${RELOAD_TYPE}" = "restart" ]; then
-		ebegin "Restarting ${SVCNAME}"
-		${APACHE2} ${APACHE2_OPTS} -k restart
-		eend $?
-	elif [ "${RELOAD_TYPE}" = "graceful" ]; then
-		ebegin "Gracefully restarting ${SVCNAME}"
-		${APACHE2} ${APACHE2_OPTS} -k graceful
-		eend $?
-	else
-		eerror "${RELOAD_TYPE} is not a valid RELOAD_TYPE. Please edit /etc/conf.d/${SVCNAME}"
-	fi
-}
-
-graceful() {
-	checkconfig || return 1
-	service_started "${SVCNAME}" || return
-	ebegin "Gracefully restarting ${SVCNAME}"
-	${APACHE2} ${APACHE2_OPTS} -k graceful
-	eend $?
-}
-
-gracefulstop() {
-	checkconfig || return 1
-
-	# zap!
-	if service_started "${SVCNAME}"; then
-		mark_service_stopped "${SVCNAME}"
-	fi
-
-	ebegin "Gracefully stopping ${SVCNAME}"
-	${APACHE2} ${APACHE2_OPTS} -k graceful-stop
-	eend $?
-}
-
-modules() {
-	checkconfig || return 1
-
-	${APACHE2} ${APACHE2_OPTS} -M 2>&1
-}
-
-fullstatus() {
-	LYNX="${LYNX:-lynx -dump}"
-	STATUSURL="${STATUSURL:-http://localhost/server-status}"
-
-	if ! service_started "${SVCNAME}"; then
-		eerror "${SVCNAME} not started"
-	elif ! type -p ${LYNX} 2>&1 >/dev/null; then
-		eerror "lynx not found! you need to emerge www-client/lynx"
-	else
-		${LYNX} ${STATUSURL}
-	fi
-}
-
-virtualhosts() {
-	checkconfd || return 1
-	${APACHE2} ${APACHE2_OPTS} -S
-}
-
-configdump() {
-	LYNX="${LYNX:-lynx -dump}"
-	INFOURL="${INFOURL:-http://localhost/server-info}"
-
-	checkconfd || return 1
-
-	if ! service_started "${SVCNAME}"; then
-		eerror "${SVCNAME} not started"
-	elif ! type -p ${LYNX} 2>&1 >/dev/null; then
-		eerror "lynx not found! you need to emerge www-client/lynx"
-	else
-		echo "${APACHE2} started with '${APACHE2_OPTS}'"
-		for i in config server list; do
-			${LYNX} "${INFOURL}/?${i}" | sed '/Apache Server Information/d;/^[[:space:]]\+[_]\+$/Q'
-		done
-	fi
-}
-
-# vim: ts=4 filetype=gentoo-init-d

diff --git a/app-backup/backuppc/files/httpd.conf b/app-backup/backuppc/files/httpd.conf
deleted file mode 100644
index b47475c..00000000
--- a/app-backup/backuppc/files/httpd.conf
+++ /dev/null
@@ -1,332 +0,0 @@
-# This is a modification of the default Apache 2.2 configuration file
-# for Gentoo Linux.
-#
-# Support:
-#   http://www.gentoo.org/main/en/lists.xml   [mailing lists]
-#   http://forums.gentoo.org/                 [web forums]
-#   irc://irc.freenode.net#gentoo-apache      [irc chat]
-#
-# Bug Reports:
-#   http://bugs.gentoo.org                    [gentoo related bugs]
-#   https://httpd.apache.org/bug_report.html   [apache httpd related bugs]
-#
-#
-# This is the main Apache HTTP server configuration file.  It contains the
-# configuration directives that give the server its instructions.
-# See <URL:https://httpd.apache.org/docs/2.2> for detailed information.
-# In particular, see
-# <URL:https://httpd.apache.org/docs/2.2/mod/directives.html>
-# for a discussion of each configuration directive.
-#
-# Do NOT simply read the instructions in here without understanding
-# what they do.  They're here only as hints or reminders.  If you are unsure
-# consult the online docs. You have been warned.
-#
-# Configuration and logfile names: If the filenames you specify for many
-# of the server's control files begin with "/" (or "drive:/" for Win32), the
-# server will use that explicit path.  If the filenames do *not* begin
-# with "/", the value of ServerRoot is prepended -- so "var/log/apache2/foo_log"
-# with ServerRoot set to "/usr" will be interpreted by the
-# server as "/usr/var/log/apache2/foo.log".
-
-# ServerRoot: The top of the directory tree under which the server's
-# configuration, error, and log files are kept.
-#
-# Do not add a slash at the end of the directory path.  If you point
-# ServerRoot at a non-local disk, be sure to point the LockFile directive
-# at a local disk.  If you wish to share the same ServerRoot for multiple
-# httpd daemons, you will need to change at least LockFile and PidFile.
-ServerRoot "/usr/lib/apache2"
-
-# Dynamic Shared Object (DSO) Support
-#
-# To be able to use the functionality of a module which was built as a DSO you
-# have to place corresponding `LoadModule' lines at this location so the
-# directives contained in it are actually available _before_ they are used.
-# Statically compiled modules (those listed by `httpd -l') do not need
-# to be loaded here.
-#
-# Example:
-# LoadModule foo_module modules/mod_foo.so
-#
-# GENTOO: Automatically defined based on APACHE2_MODULES USE_EXPAND variable.
-#         Do not change manually, it will be overwritten on upgrade.
-#
-# The following modules are considered as the default configuration.
-# If you wish to disable one of them, you may have to alter other
-# configuration directives.
-#
-# Change these at your own risk!
-
-LoadModule actions_module modules/mod_actions.so
-LoadModule alias_module modules/mod_alias.so
-LoadModule auth_basic_module modules/mod_auth_basic.so
-<IfDefine AUTH_DIGEST>
-LoadModule auth_digest_module modules/mod_auth_digest.so
-</IfDefine>
-LoadModule authn_anon_module modules/mod_authn_anon.so
-LoadModule authn_dbm_module modules/mod_authn_dbm.so
-LoadModule authn_default_module modules/mod_authn_default.so
-LoadModule authn_file_module modules/mod_authn_file.so
-LoadModule authz_dbm_module modules/mod_authz_dbm.so
-LoadModule authz_default_module modules/mod_authz_default.so
-LoadModule authz_groupfile_module modules/mod_authz_groupfile.so
-LoadModule authz_host_module modules/mod_authz_host.so
-LoadModule authz_owner_module modules/mod_authz_owner.so
-LoadModule authz_user_module modules/mod_authz_user.so
-LoadModule autoindex_module modules/mod_autoindex.so
-<IfDefine CACHE>
-LoadModule cache_module modules/mod_cache.so
-</IfDefine>
-LoadModule cgi_module modules/mod_cgi.so
-LoadModule deflate_module modules/mod_deflate.so
-LoadModule dir_module modules/mod_dir.so
-<IfDefine CACHE>
-LoadModule disk_cache_module modules/mod_disk_cache.so
-</IfDefine>
-LoadModule env_module modules/mod_env.so
-LoadModule expires_module modules/mod_expires.so
-LoadModule ext_filter_module modules/mod_ext_filter.so
-<IfDefine CACHE>
-LoadModule file_cache_module modules/mod_file_cache.so
-</IfDefine>
-LoadModule filter_module modules/mod_filter.so
-LoadModule headers_module modules/mod_headers.so
-LoadModule include_module modules/mod_include.so
-<IfDefine INFO>
-LoadModule info_module modules/mod_info.so
-</IfDefine>
-LoadModule log_config_module modules/mod_log_config.so
-LoadModule logio_module modules/mod_logio.so
-<IfDefine CACHE>
-LoadModule mem_cache_module modules/mod_mem_cache.so
-</IfDefine>
-LoadModule mime_module modules/mod_mime.so
-LoadModule mime_magic_module modules/mod_mime_magic.so
-LoadModule negotiation_module modules/mod_negotiation.so
-<IfDefine PROXY>
-LoadModule proxy_module modules/mod_proxy.so
-</IfDefine>
-<IfDefine PROXY>
-LoadModule proxy_ajp_module modules/mod_proxy_ajp.so
-</IfDefine>
-<IfDefine PROXY>
-LoadModule proxy_balancer_module modules/mod_proxy_balancer.so
-</IfDefine>
-<IfDefine PROXY>
-LoadModule proxy_connect_module modules/mod_proxy_connect.so
-</IfDefine>
-<IfDefine PROXY>
-LoadModule proxy_http_module modules/mod_proxy_http.so
-</IfDefine>
-LoadModule rewrite_module modules/mod_rewrite.so
-LoadModule setenvif_module modules/mod_setenvif.so
-LoadModule speling_module modules/mod_speling.so
-<IfDefine SSL>
-LoadModule ssl_module modules/mod_ssl.so
-</IfDefine>
-<IfDefine STATUS>
-LoadModule status_module modules/mod_status.so
-</IfDefine>
-<IfDefine SUEXEC>
-LoadModule suexec_module modules/mod_suexec.so
-</IfDefine>
-LoadModule unique_id_module modules/mod_unique_id.so
-<IfDefine USERDIR>
-LoadModule userdir_module modules/mod_userdir.so
-</IfDefine>
-LoadModule usertrack_module modules/mod_usertrack.so
-LoadModule vhost_alias_module modules/mod_vhost_alias.so
-
-#
-# HostnameLookups: Log the names of clients or just their IP addresses
-# e.g., www.apache.org (on) or 204.62.129.132 (off).
-# The default is off because it'd be overall better for the net if people
-# had to knowingly turn this feature on, since enabling it means that
-# each client request will result in AT LEAST one lookup request to the
-# nameserver.
-#
-HostnameLookups Off
-
-# If you wish httpd to run as a different user or group, you must run
-# httpd as root initially and it will switch.
-#
-# User/Group: The name (or #number) of the user/group to run httpd as.
-# It is usually good practice to create a dedicated user and group for
-# running httpd, as with most system services.
-User backuppc
-Group backuppc
-
-# Supplemental configuration
-#
-# Most of the configuration files in the /etc/apache2/modules.d/ directory can
-# be turned on using APACHE2_OPTS in /etc/conf.d/apache2 to add extra features
-# or to modify the default configuration of the server.
-#
-# To know which flag to add to APACHE2_OPTS, look at the first line of the
-# the file, which will usually be an <IfDefine OPTION> where OPTION is the
-# flag to use.
-
-Include /etc/apache2/modules.d/*.conf
-
-# Unique lock file 
-LockFile /var/lock/apache-backuppc.lock
-
-# Very important for init script
-# Unique process ID file
-PidFile /var/run/apache-backuppc.pid
-
-# Unique scoreboard file
-ScoreBoardFile /var/run/apache-backuppc.scoreboard
-
-# Common document root 
-<IfDefine BACKUPPC_VHOST>
-
-
-# Common document root 
-DocumentRoot HTDOCSDIR
-# see bug #178966 why this is in here
-
-# Listen: Allows you to bind Apache to specific IP addresses and/or
-# ports, instead of the default. See also the <VirtualHost>
-# directive.
-#
-# Change this to Listen on specific IP addresses as shown below to
-# prevent Apache from glomming onto all bound IP addresses.
-#
-#Listen 12.34.56.78:80
-Listen 80
-
-# Use name-based virtual hosting.
-NameVirtualHost *:80
-
-# When virtual hosts are enabled, the main host defined in the default
-# httpd.conf configuration will go away. We redefine it here so that it is
-# still available.
-#
-# If you disable this vhost by removing -D DEFAULT_VHOST from
-# /etc/conf.d/apache2, the first defined virtual host elsewhere will be
-# the default.
-<VirtualHost *:80>
-	ServerName backuppc
-
-	# Redirect requests to "/" to the CGI script
-	RedirectMatch "^/$" /BackupPC_Admin
-
-	<IfDefine SSL>
-		<IfModule ssl_module>
-			RewriteEngine On
-			RewriteCond %{HTTPS} !=on
-			RewriteRule ^/(.*) https://%{SERVER_NAME}/$1 [R,L]
-
-			## SSL Engine Switch:
-			# Enable/Disable SSL for this virtual host.
-			SSLEngine on
-			SSLOptions +StrictRequire
-
-			## SSL Cipher Suite:
-			# List the ciphers that the client is permitted to negotiate.
-			# See the mod_ssl documentation for a complete list.
-			SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL
-
-			## Server Certificate:
-			# Point SSLCertificateFile at a PEM encoded certificate. If the certificate
-			# is encrypted, then you will be prompted for a pass phrase. Note that a 
-			# kill -HUP will prompt again. Keep in mind that if you have both an RSA
-			# and a DSA certificate you can configure both in parallel (to also allow
-			# the use of DSA ciphers, etc.)
-			SSLCertificateFile /etc/ssl/apache2/server.crt
-
-			## Server Private Key:
-			# If the key is not combined with the certificate, use this directive to
-			# point at the key file. Keep in mind that if you've both a RSA and a DSA
-			# private key you can configure both in parallel (to also allow the use of
-			# DSA ciphers, etc.)
-			SSLCertificateKeyFile /etc/ssl/apache2/server.key
-			<FilesMatch "\.(cgi|shtml|phtml|php)$">
-				SSLOptions +StdEnvVars
-			</FilesMatch>
-
-			## ssl-accurate-shutdown:
-			# This forces an accurate shutdown when the connection is closed, i.e. a
-			# SSL close notify alert is send and mod_ssl waits for the close notify
-			# alert of the client. This is 100% SSL/TLS standard compliant, but in
-			# practice often causes hanging connections with brain-dead browsers. Use
-			# this only for browsers where you know that their SSL implementation works
-			# correctly. 
-			# Notice: Most problems of broken clients are also related to the HTTP 
-			# keep-alive facility, so you usually additionally want to disable 
-			# keep-alive for those clients, too. Use variable "nokeepalive" for this.
-			# Similarly, one has to force some clients to use HTTP/1.0 to workaround
-			# their broken HTTP/1.1 implementation. Use variables "downgrade-1.0" and
-			# "force-response-1.0" for this.
-			<IfModule setenvif_module>
-				BrowserMatch ".*MSIE.*" \
-					nokeepalive ssl-unclean-shutdown \
-						downgrade-1.0 force-response-1.0
-			</IfModule>
-
-			## Per-Server Logging:
-			# The home of a custom SSL log file. Use this when you want a compact 
-			# non-error SSL logfile on a virtual host basis.
-			<IfModule log_config_module>
-				CustomLog /var/log/apache2/ssl_request_log \
-				 	"%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
-			</IfModule>
-		</IfModule>
-	</IfDefine>
-
-<Directory "HTDOCSDIR">
-	# Possible values for the Options directive are "None", "All",
-	# or any combination of:
-	#   Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews
-	#
-	# Note that "MultiViews" must be named *explicitly* --- "Options All"
-	# doesn't give it to you.
-	#
-	# The Options directive is both complicated and important.  Please see
-	# https://httpd.apache.org/docs/2.2/mod/core.html#options
-	# for more information.
-	Options Indexes FollowSymLinks
-
-	# AllowOverride controls what directives may be placed in .htaccess files.
-	# It can be "All", "None", or any combination of the keywords:
-	#   Options FileInfo AuthConfig Limit
-	AllowOverride None
-
-	<IfDefine SSL>
-	<IfModule ssl_module>
-		SSLOptions +StdEnvVars
-	</IfModule>
-	</IfDefine>
-
-	SetHandler perl-script
-	PerlResponseHandler ModPerl::Registry
-	PerlOptions +ParseHeaders
-	Options +ExecCGI
-
-	Order allow,deny
-	Allow from all
-
-	AuthName "Backup Admin"
-	AuthType Basic
-	AuthUserFile AUTHFILE
-	Require valid-user
-</Directory>
-
-<Directory "HTDOCSDIR/image">
-	SetHandler None
-	Options Indexes FollowSymLinks
-	Order allow,deny
-	Allow from all
-</Directory>
-
-
-	<IfModule mpm_peruser_module>
-		ServerEnvironment backuppc backuppc
-	</IfModule>
-</VirtualHost>
-</IfDefine>
-
-
-# vim: ts=4 filetype=apache