[Fusionforge-commits] FusionForge branch GUM updated. 062f4818422ca2e50e0101c4403dbde48bf44a35

Sylvain Beucler beuc-inria at fusionforge.org
Wed Aug 20 13:44:01 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, GUM has been updated
       via  062f4818422ca2e50e0101c4403dbde48bf44a35 (commit)
       via  aa445d5060720cb447c0ead9c6a0bd5738e65c5f (commit)
       via  d8f75452645058103246f0d196b7fb6a388abae9 (commit)
       via  8d8e5a44bb16823f6fe94e50f4ee2a77c48849b4 (commit)
      from  0ef4e048e60ed24018a047cc141f997f7d34b936 (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 062f4818422ca2e50e0101c4403dbde48bf44a35
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Wed Aug 20 13:40:38 2014 +0200

    rpm: fixes unversioned-explicit-provides

diff --git a/src/fusionforge.spec b/src/fusionforge.spec
index 33ea68b..0bc904d 100644
--- a/src/fusionforge.spec
+++ b/src/fusionforge.spec
@@ -111,7 +111,7 @@ database.
 
 %package db-remote
 Summary: collaborative development tool - database (remote and already installed)
-Provides: %{name}-db
+Provides: %{name}-db = %{version}
 %description db-remote
 FusionForge provides many tools to aid collaboration in a
 development project, such as bug-tracking, task management,

commit aa445d5060720cb447c0ead9c6a0bd5738e65c5f
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Wed Aug 20 13:31:21 2014 +0200

    install: tidy packaging file distribution

diff --git a/src/GNUmakefile b/src/GNUmakefile
index 9113033..ef05e07 100644
--- a/src/GNUmakefile
+++ b/src/GNUmakefile
@@ -37,7 +37,7 @@ install-config: install-base-dirs
 
 install-common: install-config
 	$(MAKE) -C locale DESTDIR=$(DESTDIR) PREFIX=$(PREFIX) install
-	$(CP_R) VERSION bin common cronjobs post-install.d templates vendor lib $(DESTDIR)$(pkgdatadir)/
+	$(CP_R) VERSION bin common cronjobs post-install.d templates lib $(DESTDIR)$(pkgdatadir)/
 	$(INSTALL) -d -m 00755 $(DESTDIR)$(prefix)/bin/
 	ln -nfs $(pkgdatadir)/bin/forge_get_config $(DESTDIR)$(prefix)/bin/forge_get_config
 	ln -nfs $(pkgdatadir)/bin/forge_run_jon $(DESTDIR)$(prefix)/bin/forge_run_job
@@ -47,10 +47,10 @@ install-db: install-base-dirs
 	$(CP_R) db $(DESTDIR)$(pkgdatadir)/
 
 install-web: install-base-dirs
-	$(CP_R) www $(DESTDIR)$(pkgdatadir)/
-	$(INSTALL) -d -m 00755 $(DESTDIR)$(pkgdatadir)/www/plugins/
+	$(CP_R) vendor www $(DESTDIR)$(pkgdatadir)/
 	$(INSTALL) -d -m 00700 $(DESTDIR)$(data_path)/docman/
 	$(INSTALL) -d -m 00700 $(DESTDIR)$(data_path)/download/
+	$(INSTALL) -d -m 00700 $(DESTDIR)$(data_path)/forum/
 	$(INSTALL) -d -m 00700 $(DESTDIR)$(data_path)/tracker/
 
 install-core: install-base-dirs install-common install-web install-db
diff --git a/src/post-install.d/httpd-configure.sh b/src/post-install.d/httpd-configure.sh
index 9478d6e..3b84bd4 100755
--- a/src/post-install.d/httpd-configure.sh
+++ b/src/post-install.d/httpd-configure.sh
@@ -30,8 +30,13 @@ apache_user=$(forge_get_config apache_user)
 apache_group=$(forge_get_config apache_group)
 chown $apache_user: $data_path/docman/
 chown $apache_user: $data_path/download/
+chown $apache_user: $data_path/forum/
 chown $apache_user: $data_path/tracker/
 
+# Plugins activation from the web UI
+install -d -m 00755 $source_path/www/plugins/
+chown $apache_user: $source_path/www/plugins/
+
 # Enable required modules
 if [ -x /usr/sbin/a2enmod ]; then
     a2enmod php5 || true

commit d8f75452645058103246f0d196b7fb6a388abae9
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Wed Aug 20 11:48:34 2014 +0200

    httpd.conf.d: remove 03-config-alias-plugin.conf which is commented and overlaps with plugin-generic.inc

diff --git a/src/templates/httpd.conf.d/03-config-alias-plugin.conf b/src/templates/httpd.conf.d/03-config-alias-plugin.conf
deleted file mode 100644
index 06a7429..0000000
--- a/src/templates/httpd.conf.d/03-config-alias-plugin.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Plugins directories
-#
-
-# 1- plugins CGI scripts
-#ScriptAliasMatch ^/plugins/([^/]*/cgi-bin/.*) "{core/plugins_path}/$1"
-#<Directory "{core/plugins_path}/[^/]*/cgi-bin">
-#    AllowOverride None
-#    Options ExecCGI
-#    Order allow,deny
-#    Allow from all
-#</Directory>
-
-# 2- plugins web/php pages 
-#AliasMatch ^/plugins/([^/]*)/(.*) {core/plugins_path}/$1/www/$2
-#<DirectoryMatch "{core/plugins_path}/([^/]*)/www/">
-#    Options MultiViews
-#    AllowOverride None
-#    Order allow,deny
-#    Allow from all
-#</DirectoryMatch>
-

commit 8d8e5a44bb16823f6fe94e50f4ee2a77c48849b4
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Wed Aug 20 11:12:34 2014 +0200

    install: move plugin-specific httpd confs to their plugins dir

diff --git a/src/templates/httpd.conf.d/lists-vhost-plugin-mailman.inc b/src/plugins/mailman/etc/httpd.d/lists-vhost-plugin-mailman.inc
similarity index 100%
rename from src/templates/httpd.conf.d/lists-vhost-plugin-mailman.inc
rename to src/plugins/mailman/etc/httpd.d/lists-vhost-plugin-mailman.inc
diff --git a/src/templates/httpd.conf.d/50-wsgi-moinmoin.conf b/src/plugins/moinmoin/etc/httpd.conf.d/50-wsgi-moinmoin.conf
similarity index 100%
rename from src/templates/httpd.conf.d/50-wsgi-moinmoin.conf
rename to src/plugins/moinmoin/etc/httpd.conf.d/50-wsgi-moinmoin.conf
diff --git a/src/templates/httpd.conf.d/50-wsgi-scmbzr.conf b/src/plugins/scmbzr/etc/httpd.conf.d/50-wsgi-scmbzr.conf
similarity index 100%
rename from src/templates/httpd.conf.d/50-wsgi-scmbzr.conf
rename to src/plugins/scmbzr/etc/httpd.conf.d/50-wsgi-scmbzr.conf

-----------------------------------------------------------------------

Summary of changes:
 src/GNUmakefile                                    |    6 +++---
 src/fusionforge.spec                               |    2 +-
 .../etc/httpd.d}/lists-vhost-plugin-mailman.inc    |    0
 .../etc}/httpd.conf.d/50-wsgi-moinmoin.conf        |    0
 .../scmbzr/etc}/httpd.conf.d/50-wsgi-scmbzr.conf   |    0
 src/post-install.d/httpd-configure.sh              |    5 +++++
 .../httpd.conf.d/03-config-alias-plugin.conf       |   22 --------------------
 7 files changed, 9 insertions(+), 26 deletions(-)
 rename src/{templates/httpd.conf.d => plugins/mailman/etc/httpd.d}/lists-vhost-plugin-mailman.inc (100%)
 rename src/{templates => plugins/moinmoin/etc}/httpd.conf.d/50-wsgi-moinmoin.conf (100%)
 rename src/{templates => plugins/scmbzr/etc}/httpd.conf.d/50-wsgi-scmbzr.conf (100%)
 delete mode 100644 src/templates/httpd.conf.d/03-config-alias-plugin.conf


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list