[Pkg-apache-commits] [SCM] Debian packaging for apache2 (Apache HTTPD 2.x) branch, next, updated. 4a7e5ad42b5b84ec4f8f03d4c5452ce3fdefdeb5
Stefan Fritsch
sf at sfritsch.de
Sun Apr 15 15:38:23 UTC 2012
The following commit has been merged in the next branch:
commit 4a7e5ad42b5b84ec4f8f03d4c5452ce3fdefdeb5
Author: Stefan Fritsch <sf at sfritsch.de>
Date: Sun Apr 15 17:36:52 2012 +0200
Fix all config files to use tabs for indentation
Enforce this during the build to avoid regressions
diff --git a/debian/config-dir/mods-available/cache_disk.conf b/debian/config-dir/mods-available/cache_disk.conf
index ca9513c..5489e23 100644
--- a/debian/config-dir/mods-available/cache_disk.conf
+++ b/debian/config-dir/mods-available/cache_disk.conf
@@ -7,13 +7,13 @@
# man page.
# This path must be the same as the one in /etc/default/apache2
- CacheRoot /var/cache/apache2/mod_cache_disk
+ CacheRoot /var/cache/apache2/mod_cache_disk
# This will also cache local documents. It usually makes more sense to
# put this into the configuration for just one virtual host.
#CacheEnable disk /
- CacheDirLevels 5
- CacheDirLength 3
+ CacheDirLevels 5
+ CacheDirLength 3
</IfModule>
diff --git a/debian/config-dir/mods-available/deflate.conf b/debian/config-dir/mods-available/deflate.conf
index 7aae8b7..26f84e8 100644
--- a/debian/config-dir/mods-available/deflate.conf
+++ b/debian/config-dir/mods-available/deflate.conf
@@ -1,12 +1,12 @@
<IfModule mod_deflate.c>
<IfModule mod_filter.c>
- # these are known to be safe with MSIE 6
- AddOutputFilterByType DEFLATE text/html text/plain text/xml
+ # these are known to be safe with MSIE 6
+ AddOutputFilterByType DEFLATE text/html text/plain text/xml
- # everything else may cause problems with MSIE 6
- AddOutputFilterByType DEFLATE text/css
- AddOutputFilterByType DEFLATE application/x-javascript application/javascript application/ecmascript
- AddOutputFilterByType DEFLATE application/rss+xml
- AddOutputFilterByType DEFLATE application/xml
+ # everything else may cause problems with MSIE 6
+ AddOutputFilterByType DEFLATE text/css
+ AddOutputFilterByType DEFLATE application/x-javascript application/javascript application/ecmascript
+ AddOutputFilterByType DEFLATE application/rss+xml
+ AddOutputFilterByType DEFLATE application/xml
</IfModule>
</IfModule>
diff --git a/debian/config-dir/mods-available/dir.conf b/debian/config-dir/mods-available/dir.conf
index e16fcb3..2fe1a9a 100644
--- a/debian/config-dir/mods-available/dir.conf
+++ b/debian/config-dir/mods-available/dir.conf
@@ -1,5 +1,5 @@
<IfModule mod_dir.c>
- DirectoryIndex index.html index.cgi index.pl index.php index.xhtml index.htm
+ DirectoryIndex index.html index.cgi index.pl index.php index.xhtml index.htm
</IfModule>
diff --git a/debian/config-dir/mods-available/mime_magic.conf b/debian/config-dir/mods-available/mime_magic.conf
index 59aaee6..5274dd8 100644
--- a/debian/config-dir/mods-available/mime_magic.conf
+++ b/debian/config-dir/mods-available/mime_magic.conf
@@ -1,3 +1,3 @@
<IfModule mod_mime_magic.c>
- MIMEMagicFile /etc/apache2/magic
+ MIMEMagicFile /etc/apache2/magic
</IfModule>
diff --git a/debian/config-dir/mods-available/userdir.conf b/debian/config-dir/mods-available/userdir.conf
index e21f364..0814b6d 100644
--- a/debian/config-dir/mods-available/userdir.conf
+++ b/debian/config-dir/mods-available/userdir.conf
@@ -1,16 +1,16 @@
<IfModule mod_userdir.c>
- UserDir public_html
- UserDir disabled root
+ UserDir public_html
+ UserDir disabled root
- <Directory /home/*/public_html>
- AllowOverride FileInfo AuthConfig Limit Indexes
- Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
- <Limit GET POST OPTIONS>
- Require all granted
- </Limit>
- <LimitExcept GET POST OPTIONS>
- Require all denied
- </LimitExcept>
- </Directory>
+ <Directory /home/*/public_html>
+ AllowOverride FileInfo AuthConfig Limit Indexes
+ Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
+ <Limit GET POST OPTIONS>
+ Require all granted
+ </Limit>
+ <LimitExcept GET POST OPTIONS>
+ Require all denied
+ </LimitExcept>
+ </Directory>
</IfModule>
diff --git a/debian/config-dir/sites-available/default-ssl.conf b/debian/config-dir/sites-available/default-ssl.conf
index 850f1e0..33a9f55 100644
--- a/debian/config-dir/sites-available/default-ssl.conf
+++ b/debian/config-dir/sites-available/default-ssl.conf
@@ -14,12 +14,12 @@
CustomLog ${APACHE_LOG_DIR}/access.log combined
- # For most configuration files from conf-available/, which are
- # enabled or disabled at a global level, it is possible to
- # include a it only for a particular virtual host. For example the
- # following line enables the CGI configuration for this host
- # only after disabling it globally with "a2disconf".
- #Include conf-available/serve-cgi-bin.conf
+ # For most configuration files from conf-available/, which are
+ # enabled or disabled at a global level, it is possible to
+ # include a it only for a particular virtual host. For example the
+ # following line enables the CGI configuration for this host
+ # only after disabling it globally with "a2disconf".
+ #Include conf-available/serve-cgi-bin.conf
# SSL Engine Switch:
# Enable/Disable SSL for this virtual host.
diff --git a/debian/rules b/debian/rules
index 08357a7..7736dad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,6 +40,20 @@ unpatch:
rm patch.stamp ;\
fi
+prebuild-checks:
+ ERRS="" ;\
+ for a in $$(find debian/config-dir/ -type f) ; do \
+ t="$$a.$$$$" ;\
+ unexpand < "$$a" > "$$t" ;\
+ cmp -s "$$a" "$$t" || ERRS="$$ERRS $$a" ;\
+ rm "$$t" ;\
+ done ;\
+ if [ -n "$$ERRS" ] ; then \
+ echo 'ERROR: The following files contain spaces instead of tabs. Run through unexpand!' ;\
+ ls -1 $$ERRS ;\
+ false ;\
+ fi
+
clean-config-vars:
# Clean up config_vars.mk
# FIXME: Maybe someone could document here why we actually need to
@@ -68,7 +82,7 @@ generate-maintainer-scripts:
%:
dh $@ --parallel --with autotools_dev
-override_dh_auto_configure: patch generate-maintainer-scripts
+override_dh_auto_configure: patch generate-maintainer-scripts prebuild-checks
./configure --enable-layout=Debian --enable-so --with-program-name=apache2 \
--enable-suexec --with-suexec-caller=www-data \
--with-suexec-bin=/usr/lib/apache2/suexec --with-suexec-docroot=/var/www \
@@ -139,4 +153,4 @@ override_dh_auto_install:
override_dh_clean: unpatch
dh_clean
-.PHONY: patch unpatch generate-maintainer-scripts clean-config-vars prepare-scripts
+.PHONY: patch unpatch generate-maintainer-scripts clean-config-vars prepare-scripts prebuild-checks
--
Debian packaging for apache2 (Apache HTTPD 2.x)
More information about the Pkg-apache-commits
mailing list