src/packaging/install/web-apache2-vhosts -text
src/packaging/links/common -text
src/packaging/links/web-apache2 -text
+src/packaging/readme/web-apache2 -text
src/plugins/README -text
src/plugins/aselectextauth/etc/aselectextauth.ini -text
src/plugins/authbuiltin/common/AuthBuiltinPlugin.class.php -text
-- Roland Mas <lolando@debian.org> Fri, 05 Aug 2011 13:41:04 +0200
+fusionforge (5.1.1-3) UNRELEASED; urgency=low
+
+ * Add new README.Debian for gforge-web-apache2 specifically.
+
+ -- Olivier Berger <obergix@debian.org> Mon, 21 Nov 2011 17:33:28 +0100
+
fusionforge (5.1.1-2) unstable; urgency=low
* New upstream SVN snapshot.
PDOCSFILES=$(foreach i,$(ENABLED_PLUGINS),$(if $(wildcard plugins/$i/packaging/docs/[a-z]*),debian/$(PACKAGE)-plugin-$i.docs))
PEXAMPLESSFILES=$(foreach i,$(ENABLED_PLUGINS),$(if $(wildcard plugins/$i/packaging/examples/[a-z]*),debian/$(PACKAGE)-plugin-$i.examples))
+READMEFILES=$(patsubst packaging/readme/%,debian/$(OLDPACKAGE)-%.README.Debian,$(wildcard packaging/readme/[a-z]*)) \
+ $(patsubst packaging/readme/%,debian/$(PACKAGE)-%.README.Debian,$(wildcard packaging/readme/[a-z]*))
POFILES=$(patsubst debian/dsf-po/%,debian/po/%,$(wildcard debian/dsf-po/*) debian/po/POTFILES.in)
@echo "LINKSFILES=$(LINKSFILES)"
@echo "INSTALLFILES=$(INSTALLFILES)"
@echo "DOCSFILES=$(DOCSFILES)"
+ @echo "READMEFILES=$(READMEFILES)"
@echo ""
@echo "PCRONDFILES=$(PCRONDFILES)"
@echo "PDIRSFILES=$(PDIRSFILES)"
sh $(CURDIR)/deb-specific/manage-uufiles.sh clean
.PHONY: conffiles
-conffiles: $(PPOSTINST) $(PPRERM) $(CRONDFILES) $(DIRSFILES) $(LINKSFILES) $(INSTALLFILES) $(DOCSFILES) $(PCRONDFILES) $(PDIRSFILES) $(PLINKSFILES) $(PINSTALLFILES) $(PDOCSFILES) $(PEXAMPLESFILES) debian/control
+conffiles: $(PPOSTINST) $(PPRERM) $(CRONDFILES) $(DIRSFILES) $(LINKSFILES) $(INSTALLFILES) $(DOCSFILES) $(READMEFILES) $(PCRONDFILES) $(PDIRSFILES) $(PLINKSFILES) $(PINSTALLFILES) $(PDOCSFILES) $(PEXAMPLESFILES) debian/control
# Construct the plugin's 'postinst' script out of a template in debian/dsf-in/plugin.postinst
debian/$(PACKAGE)-plugin-%.postinst:
debian/$(PACKAGE)-plugin-%.examples:
$(SED_REPLACE) $(CURDIR)/plugins/$*/packaging/examples/plugin-$* > $@
+debian/$(OLDPACKAGE)-%.README.Debian:
+ $(SED_REPLACE) $(CURDIR)/packaging/readme/$* > $@
+debian/$(PACKAGE)-%.README.Debian:
+ $(SED_REPLACE) $(CURDIR)/packaging/readme/$* > $@
+
# Construct the control file
debian/control: $(wildcard packaging/control/*) $(wildcard plugins/*/packaging/control/[1-9][0-9][0-9]*) $(wildcard plugins/*/etc/*.ini)
ls $(CURDIR)/packaging/control/[0-9][0-9][0-9]* | grep -v shortdesc | \
rm -f $(CURDIR)/debian/*.install
rm -f $(CURDIR)/debian/*.docs
rm -f $(CURDIR)/debian/*.examples
+ rm -f $(CURDIR)/debian/*.README.Debian
rm -f $(CURDIR)/debian/$(PACKAGE)-config.sgml
rm -f $(CURDIR)/debian/$(OLDPACKAGE)-common.manpages
rm -f cvssh.1 $(PACKAGE)-config.1
# Rename config files
mv $(CURDIR)/debian/$(OLDPACKAGE)-common/etc/$(PACKAGE)/config.ini-fhs $(CURDIR)/debian/$(OLDPACKAGE)-common/etc/$(PACKAGE)/config.ini
- cp -r $(CURDIR)/debian/$(OLDPACKAGE)-web-apache2/usr/share/$(OLDPACKAGE)/etc/httpd.conf.d-fhs $(CURDIR)/debian/$(OLDPACKAGE)-web-apache2/etc/$(OLDPACKAGE)/httpd.conf.d
+ mkdir -p $(CURDIR)/debian/$(OLDPACKAGE)-web-apache2/etc/$(OLDPACKAGE)/httpd.conf.d
+ cp $(CURDIR)/debian/$(OLDPACKAGE)-web-apache2/usr/share/$(OLDPACKAGE)/etc/httpd.conf.d-fhs/*.conf $(CURDIR)/debian/$(OLDPACKAGE)-web-apache2/etc/$(OLDPACKAGE)/httpd.conf.d/
+ cp $(CURDIR)/debian/$(OLDPACKAGE)-web-apache2/usr/share/$(OLDPACKAGE)/etc/httpd.conf.d-fhs/*.inc $(CURDIR)/debian/$(OLDPACKAGE)-web-apache2/etc/$(OLDPACKAGE)/httpd.conf.d/
cp $(CURDIR)/debian/$(OLDPACKAGE)-web-apache2/usr/share/$(OLDPACKAGE)/etc/httpd.conf-fhs $(CURDIR)/debian/$(OLDPACKAGE)-web-apache2/etc/$(OLDPACKAGE)/httpd.conf
# Remove those that need to be generated at install time
+The following information may be helpful to developers.
+
The different httpd.conf.d-*/ directories are *generated* out of
-contents of httpd.conf.d/.
+contents of 'httpd.conf.d/'. At the moment, there are 3 flavours of
+these files ("fhs", "opt" and "usrlocal").
+
+The script src/utils/manage-apache-config.sh must be used to
+regenerate the files for these flavours.
-See src/utils/manage-apache-config.sh
+Please make modifications in the source files inside 'httpd.conf.d/'
+and regenerate.
-Please make modifications in the source files inside httpd.conf.d/.
+More details available in :
+http://lists.fusionforge.org/pipermail/fusionforge-general/2010-June/001074.html
-- Olivier Berger
# Include all FusionForge-related configuration files
+#
+# TODO: add a pointer to documentation about the Apache configuration of FusionForge
+#
Include /etc/gforge/httpd.conf.d/*.conf
+# Name-based Virtual Host Support : supports multiple websites over a single IP address
+
NameVirtualHost *:80
NameVirtualHost *:443
#
-# Main directory options
+# Main directory options ({core/source_path}/www contains the PHP scripts of FusionForge)
#
<Directory {core/source_path}/www>
Options Indexes FollowSymlinks
AllowOverride All
+ # define access restrictions for the main site
Include {core/config_path}/httpd.conf.d/auth-main.inc
#
#
# Main host
#
+
+# Differences between HTTP and HTTPS are in ssl-on.inc/ssl-off.inc
+
<VirtualHost *:80>
Include {core/config_path}/httpd.conf.d/vhost-main.inc
Include {core/config_path}/httpd.conf.d/block-trace.inc
+
+# We are inside <VirtualHost ...>
+
ServerName {core/web_host}
ServerAlias www.{core/web_host}
ServerAdmin webmaster@{core/web_host}
UserDir disabled
</IfModule>
+# Define configuration/env variables for passing passwords and other secrets to PHP
<Directory {core/source_path}/www>
Include {core/config_path}/httpd.conf.d/secrets.inc
</Directory>
-# per-project vhost content
+# per-project vhost content : myproject1.myforge.com, myproject2.myforge.com, etc.
ServerName siteadmin.{core/web_host}
ServerAlias *.{core/web_host}
--- /dev/null
+This file documents the Apache 2 Web server configuration for
+@PACKAGE@ in Debian.
+
+See /usr/share/doc/@OLDPACKAGE@-common/README.Debian(.gz) for more
+generic documentation about @PACKAGE@ packaging in Debian.
+
+See
+http://lists.fusionforge.org/pipermail/fusionforge-general/2010-June/001074.html
+which gives some hints on the design principle behind the Web server
+configuration files adopted for this packaging.
+
+ -- Olivier Berger <obergix@debian.org>, Mon, 21 Nov 2011 16:58:44 +0100
+
+# Local Variables:
+# mode: readme-debian
+# End:
+
#! /bin/bash -e
-# Generates contents of the apache configuration files based on the sources in src/etc/httpd.conf.d/ :
+# Generates contents of the apache configuration files based on the
+# sources in src/etc/httpd.conf.d/ for 3 different flavours :
# - src/etc/httpd.conf.d-fhs/ : for FHS like paths (/usr, ...)
# - src/etc/httpd.conf.d-opt/ : for /opt like paths
# - src/etc/httpd.conf.d-usrlocal/ : for /usr/local like paths
# See the thread at : http://lists.fusionforge.org/pipermail/fusionforge-general/2010-June/001067.html for some more details
#
+# invoke with utils/manage-apache-config.sh build to regenerate the config files
+# or with utils/manage-apache-config.sh install to ...(TODO: document this)...
+
case $1 in
build)
# Change to the script directory
-e 's,{scmsvn/repos_path},/var/lib/gforge/chroot/scmrepos/svn,g' \
$i > httpd.conf.d-fhs/$(basename $i)
done
+ message="FHS like paths"
+ cat > httpd.conf.d-fhs/README.generated <<EOF
+Attention developers : contents of this directory are *generated
+files* for $message.
+
+See ../README.httpd-conf-d-flavours for more details
+
+-- OlivierBerger
+EOF
# /opt like paths
mkdir -p httpd.conf.d-opt
-e 's,{scmsvn/repos_path},/var/lib/gforge/svnroot,g' \
$i > httpd.conf.d-opt/$(basename $i)
done
+ message="/opt like paths"
+ cat > httpd.conf.d-opt/README.generated <<EOF
+Attention developers : contents of this directory are *generated
+files* for $message.
+
+See ../README.httpd-conf-d-flavours for more details
+
+-- OlivierBerger
+EOF
# /usr/local like paths
mkdir -p httpd.conf.d-usrlocal
-e 's,{scmsvn/repos_path},/var/lib/gforge/chroot/scmrepos/svn,g' \
$i > httpd.conf.d-usrlocal/$(basename $i)
done
+ message="/usr/local like paths"
+ cat > httpd.conf.d-usrlocal/README.generated <<EOF
+Attention developers : contents of this directory are *generated
+files* for $message.
+
+See ../README.httpd-conf-d-flavours for more details
+
+-- OlivierBerger
+EOF
;;
install)
*)
echo "Unknown operation"
+ echo "invoke with $0 [build|install]"
exit 1
;;
esac
projects / fusionforge / fusionforge.git / commitdiff