[Fusionforge-commits] FusionForge branch feature/concurrent-ssh-http-for-scm updated. 92ee8cc82325d7e27657558d70cb259c10c1df09
Roland Mas
lolando at fusionforge.org
Fri Oct 17 09:49:24 CEST 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, feature/concurrent-ssh-http-for-scm has been updated
via 92ee8cc82325d7e27657558d70cb259c10c1df09 (commit)
via 6defcb43d696a496d5035bc5db2c21e819bf0108 (commit)
from 4c124ad624c4401a588f6aa18abbe6cf64264dc7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 92ee8cc82325d7e27657558d70cb259c10c1df09
Author: Roland Mas <lolando at debian.org>
Date: Fri Oct 17 09:49:04 2014 +0200
Added missing Apache modules
diff --git a/autoinstall/install-src.sh b/autoinstall/install-src.sh
index 04d3e19..39cbea4 100755
--- a/autoinstall/install-src.sh
+++ b/autoinstall/install-src.sh
@@ -32,7 +32,7 @@ if [ -e /etc/debian_version ]; then
apt-get install -y make gettext php5-cli php5-pgsql php-htmlpurifier \
libapache2-mpm-itk \
apache2 locales-all postgresql libnss-pgsql2 unscd \
- subversion augeas-tools viewvc git \
+ subversion libapache2-mod-svn augeas-tools viewvc git \
mediawiki \
python-moinmoin libapache2-mod-wsgi python-psycopg2
else
diff --git a/src/plugins/scmsvn/packaging/control/131plugin-scmsvn b/src/plugins/scmsvn/packaging/control/131plugin-scmsvn
index 18fa19b..c668d9a 100644
--- a/src/plugins/scmsvn/packaging/control/131plugin-scmsvn
+++ b/src/plugins/scmsvn/packaging/control/131plugin-scmsvn
@@ -1,7 +1,7 @@
Package: @PACKAGE at -plugin-scmsvn
Architecture: all
-Depends: @OLDPACKAGE at -common, @OLDPACKAGE at -db-postgresql | @OLDPACKAGE at -db, @OLDPACKAGE at -shell-postgresql | @OLDPACKAGE at -shell, subversion, subversion-tools, python-subversion, python (>= 2.3), php5-cli, openbsd-inetd | inet-superserver, update-inetd, acl, ${misc:Depends}
-Recommends: libapache2-svn, @OLDPACKAGE at -web-apache2 | @OLDPACKAGE at -web
+Depends: @OLDPACKAGE at -common, @OLDPACKAGE at -db-postgresql | @OLDPACKAGE at -db, @OLDPACKAGE at -shell-postgresql | @OLDPACKAGE at -shell, subversion, subversion-tools, python-subversion, python (>= 2.3), php5-cli, openbsd-inetd | inet-superserver, update-inetd, acl, ${misc:Depends}, libapache2-mod-svn
+Recommends: @OLDPACKAGE at -web-apache2 | @OLDPACKAGE at -web
Provides: @PACKAGE at -plugin-scm, @OLDPACKAGE at -plugin-scmsvn
Conflicts: @OLDPACKAGE at -plugin-scmsvn
Replaces: @OLDPACKAGE at -plugin-scmsvn
diff --git a/src/post-install.d/web/web.sh b/src/post-install.d/web/web.sh
index f749935..244f921 100755
--- a/src/post-install.d/web/web.sh
+++ b/src/post-install.d/web/web.sh
@@ -95,6 +95,8 @@ case "$1" in
#a2enmod proxy_http
a2enmod macro
a2enmod authz_groupfile
+ a2enmod dav
+ a2enmod dav_svn
fi
# else: Apache modules already enabled in CentOS
commit 6defcb43d696a496d5035bc5db2c21e819bf0108
Author: Roland Mas <lolando at debian.org>
Date: Fri Oct 17 09:44:13 2014 +0200
Moved Apache config files to their new location
diff --git a/src/templates/httpd.conf.d/05-config-macros-scmgit.conf b/src/plugins/scmgit/etc/httpd.conf.d/05-config-macros-scmgit.conf
similarity index 100%
rename from src/templates/httpd.conf.d/05-config-macros-scmgit.conf
rename to src/plugins/scmgit/etc/httpd.conf.d/05-config-macros-scmgit.conf
diff --git a/src/templates/httpd.conf.d/vhost-scm-plugin-scmgit.inc b/src/plugins/scmgit/etc/httpd.conf.d/vhost-scm-plugin-scmgit.inc
similarity index 100%
rename from src/templates/httpd.conf.d/vhost-scm-plugin-scmgit.inc
rename to src/plugins/scmgit/etc/httpd.conf.d/vhost-scm-plugin-scmgit.inc
diff --git a/src/templates/httpd.conf.d/05-config-macros-scmsvn.conf b/src/plugins/scmsvn/etc/httpd.conf.d/05-config-macros-scmsvn.conf
similarity index 100%
rename from src/templates/httpd.conf.d/05-config-macros-scmsvn.conf
rename to src/plugins/scmsvn/etc/httpd.conf.d/05-config-macros-scmsvn.conf
diff --git a/src/templates/httpd.conf.d/vhost-scm-plugin-scmsvn.inc b/src/plugins/scmsvn/etc/httpd.conf.d/vhost-scm-plugin-scmsvn.inc
similarity index 100%
rename from src/templates/httpd.conf.d/vhost-scm-plugin-scmsvn.inc
rename to src/plugins/scmsvn/etc/httpd.conf.d/vhost-scm-plugin-scmsvn.inc
-----------------------------------------------------------------------
Summary of changes:
autoinstall/install-src.sh | 2 +-
.../scmgit/etc}/httpd.conf.d/05-config-macros-scmgit.conf | 0
.../scmgit/etc}/httpd.conf.d/vhost-scm-plugin-scmgit.inc | 0
.../scmsvn/etc}/httpd.conf.d/05-config-macros-scmsvn.conf | 0
.../scmsvn/etc}/httpd.conf.d/vhost-scm-plugin-scmsvn.inc | 0
src/plugins/scmsvn/packaging/control/131plugin-scmsvn | 4 ++--
src/post-install.d/web/web.sh | 2 ++
7 files changed, 5 insertions(+), 3 deletions(-)
rename src/{templates => plugins/scmgit/etc}/httpd.conf.d/05-config-macros-scmgit.conf (100%)
rename src/{templates => plugins/scmgit/etc}/httpd.conf.d/vhost-scm-plugin-scmgit.inc (100%)
rename src/{templates => plugins/scmsvn/etc}/httpd.conf.d/05-config-macros-scmsvn.conf (100%)
rename src/{templates => plugins/scmsvn/etc}/httpd.conf.d/vhost-scm-plugin-scmsvn.inc (100%)
hooks/post-receive
--
FusionForge
More information about the Fusionforge-commits
mailing list