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, 6.0 has been updated
via acc15defd3a4401f55a62ffab3bad06bb5376e71 (commit)
from dfd4e45b2cd274965a8c18b313496f2873546ff5 (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 acc15defd3a4401f55a62ffab3bad06bb5376e71
Author: Sylvain Beucler <[email protected]>
Date: Mon Mar 30 16:18:00 2015 +0200
scm: make a separate package so that the crons are not installed everywhere
(and run by systasksd)
diff --git a/autoinstall/install-src.sh b/autoinstall/install-src.sh
index 9cb3681..da1aaea 100755
--- a/autoinstall/install-src.sh
+++ b/autoinstall/install-src.sh
@@ -53,11 +53,11 @@ fi
(
cd $(dirname $0)/../src/
make
- make install-base install-shell \
+ make install-base install-shell install-scm \
install-plugin-scmsvn install-plugin-scmgit \
install-plugin-blocks install-plugin-mediawiki install-plugin-moinmoin
\
install-plugin-online_help
- make post-install-base post-install-shell \
+ make post-install-base post-install-shell post-install-scm \
post-install-plugin-scmsvn post-install-plugin-scmgit \
post-install-plugin-blocks post-install-plugin-mediawiki
post-install-plugin-moinmoin \
post-install-plugin-online_help
diff --git a/autoinstall/install.sh b/autoinstall/install.sh
index 2de190d..563672e 100755
--- a/autoinstall/install.sh
+++ b/autoinstall/install.sh
@@ -39,7 +39,7 @@ if [ -e /etc/debian_version ]; then
$APT install fusionforge
# Additional components for testsuite
- $APT install fusionforge-shell \
+ $APT install fusionforge-shell fusionforge-scm \
fusionforge-plugin-scmgit fusionforge-plugin-scmsvn
fusionforge-plugin-scmbzr \
fusionforge-plugin-mediawiki fusionforge-plugin-moinmoin \
fusionforge-plugin-blocks
@@ -54,7 +54,7 @@ else
yum upgrade -y
else
# Initial installation
- yum install -y fusionforge fusionforge-shell \
+ yum install -y fusionforge fusionforge-shell fusionforge-scm \
fusionforge-plugin-scmgit fusionforge-plugin-scmsvn \
fusionforge-plugin-mediawiki \
fusionforge-plugin-blocks fusionforge-plugin-online_help
diff --git a/src/GNUmakefile b/src/GNUmakefile
index f05d798..7fdff1a 100644
--- a/src/GNUmakefile
+++ b/src/GNUmakefile
@@ -66,7 +66,6 @@ install-common: install-config install-plugin-authbuiltin
$(CP_R) VERSION bin common templates lib $(DESTDIR)$(pkgdatadir)/
chmod 755 $(DESTDIR)$(pkgdatadir)/bin/ssh_akc.php
$(INSTALL) -d -m 00755 $(DESTDIR)$(config_path)/custom/
- $(CP_R) cronjobs/scm $(DESTDIR)$(pkgdatadir)/cronjobs/ # no dedicated
'scm' package now
$(CP_R) post-install.d/common $(DESTDIR)$(pkgdatadir)/post-install.d/
$(CP_R) plugins/env.inc.php $(DESTDIR)$(pkgdatadir)/plugins/
$(INSTALL) -d -m 00755 $(DESTDIR)$(bindir)
@@ -104,7 +103,7 @@ install-web: install-base-dirs
sed 's,@log_path@,$(log_path),' etc/logrotate.d/fusionforge-web
\
> $(DESTDIR)$(sysconfdir)/logrotate.d/fusionforge-web; \
fi
-# TODO: multiple servers support
+# TODO: multiple servers support?
# (e.g. install scm, lists, vhosts and vhosts-extra separately)
install-web-vhosts: install-base-dirs
@@ -115,6 +114,13 @@ install-shell: install-base-dirs
$(CP_R) cronjobs/shell $(DESTDIR)$(pkgdatadir)/cronjobs/
$(CP_R) post-install.d/shell $(DESTDIR)$(pkgdatadir)/post-install.d/
+install-scm: install-base-dirs
+ $(CP_R) cronjobs/scm $(DESTDIR)$(pkgdatadir)/cronjobs/
+ if [ ! -e $(DESTDIR)$(sysconfdir)/cron.d/fusionforge-scm ]; then \
+ sed 's,@bindir@,$(bindir),' etc/cron.d/fusionforge-scm \
+ > $(DESTDIR)$(sysconfdir)/cron.d/fusionforge-scm; \
+ fi
+
install-mta-postfix: install-base-dirs
$(CP_R) post-install.d/mta-postfix
$(DESTDIR)$(pkgdatadir)/post-install.d/
@@ -175,6 +181,8 @@ post-install-web:
post-install-shell:
$(post_source_path)/post-install.d/shell/shell.sh configure
+post-install-scm:
+# nothing yet
post-install-mta-postfix:
$(post_source_path)/post-install.d/mta-postfix/mta-postfix.sh configure
post-install-mta-exim4:
@@ -182,7 +190,7 @@ post-install-mta-exim4:
post-install-lists:
$(post_source_path)/post-install.d/lists/lists.sh configure
-PLUGINS_INSTALLED:=$(shell cd $(post_plugins_path) 2>/dev/null && find *
-maxdepth 0 -type d)
+PLUGINS_INSTALLED:=$(shell [ -d "$(post_plugins_path)" ] && cd
$(post_plugins_path) && find * -maxdepth 0 -type d)
PLUGINS_POST_INSTALL_TARGETS=$(addprefix
post-install-plugin-,$(PLUGINS_INSTALLED))
# Not depending on PLUGINS_POST_INSTALL_TARGETS: too many dependencies and
non-production plugins
post-install-plugins:
diff --git a/src/debian/control.in b/src/debian/control.in
index 0254e71..fefd192 100644
--- a/src/debian/control.in
+++ b/src/debian/control.in
@@ -114,6 +114,19 @@ Description: collaborative development tool - shell
accounts (using PostgreSQL)
database to FusionForge users.
+Package: fusionforge-scm
+Architecture: all
+Depends: fusionforge-common (=${source:Version}), fusionforge-shell
(=${source:Version}), php5-cli, ${misc:Depends}
+Description: collaborative development tool - shell accounts (using PostgreSQL)
+ FusionForge provides many tools to aid collaboration in a
+ development project, such as bug-tracking, task management,
+ mailing-lists, SCM repository, forums, support request helper,
+ web/FTP hosting, release management, etc. All these services are
+ integrated into one web site and managed through a web interface.
+ .
+ This package manages SCM repositories.
+
+
Package: fusionforge-mta-postfix
Architecture: all
Depends: fusionforge-common (=${source:Version}), postfix, postfix-pgsql,
${misc:Depends}
diff --git a/src/debian/rules b/src/debian/rules
index a73a8dc..d4d9c69 100755
--- a/src/debian/rules
+++ b/src/debian/rules
@@ -27,6 +27,7 @@ override_dh_auto_install:
make install-web prefix=/usr
DESTDIR=$(CURDIR)/debian/fusionforge-web
make install-web-vhosts prefix=/usr
DESTDIR=$(CURDIR)/debian/fusionforge-web-vhosts
make install-shell prefix=/usr
DESTDIR=$(CURDIR)/debian/fusionforge-shell
+ make install-scm prefix=/usr
DESTDIR=$(CURDIR)/debian/fusionforge-scm
make install-mta-postfix prefix=/usr
DESTDIR=$(CURDIR)/debian/fusionforge-mta-postfix
make install-mta-exim4 prefix=/usr
DESTDIR=$(CURDIR)/debian/fusionforge-mta-exim4
make install-lists prefix=/usr
DESTDIR=$(CURDIR)/debian/fusionforge-lists
diff --git a/src/etc/cron.d/fusionforge-db b/src/etc/cron.d/fusionforge-db
index c202bdb..6bdde28 100644
--- a/src/etc/cron.d/fusionforge-db
+++ b/src/etc/cron.d/fusionforge-db
@@ -1,5 +1,5 @@
#
-# Regular cron jobs for the db-postgresql package
+# Regular cron jobs for the fusionforge-db-local package
#
PATH=@bindir@:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
@@ -39,12 +39,6 @@
PATH=@bindir@:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
# Weekly db vacuum (should be done after ALL OTHER JOBS)
50 2 * * 1 root forge_run_job db/vacuum.php
-# Gather commit stats from SCM repositories
-0 2 * * * root forge_run_job scm/gather_scm_stats.php
-
-# Generate snapshots and tarballs from SCM repositories
-0 3 * * * root forge_run_job scm/generate_scm_snapshots.php
-
# this cronjob analyse the apache log and instert them in the db table
stats_subd_pages
# this is not used in fusionforge IHM.
# Daily sweep of the HTTP log files for project activity
diff --git a/src/etc/cron.d/fusionforge-scm b/src/etc/cron.d/fusionforge-scm
new file mode 100644
index 0000000..5a29832
--- /dev/null
+++ b/src/etc/cron.d/fusionforge-scm
@@ -0,0 +1,11 @@
+#
+# Regular cron jobs for the fusionforge-scm package
+#
+PATH=@bindir@:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+
+# Gather commit stats from SCM repositories
+0 2 * * * root forge_run_job scm/gather_scm_stats.php
+
+# Generate snapshots and tarballs from SCM repositories
+0 3 * * * root forge_run_job scm/generate_scm_snapshots.php
+
diff --git a/src/rpm/fusionforge.spec.in b/src/rpm/fusionforge.spec.in
index 203ccfc..d313ffd 100644
--- a/src/rpm/fusionforge.spec.in
+++ b/src/rpm/fusionforge.spec.in
@@ -70,6 +70,7 @@ install_listfiles db-local
install_listfiles web
install_listfiles web-vhosts
install_listfiles shell
+install_listfiles scm
install_listfiles mta-postfix
install_listfiles mta-exim4
install_listfiles lists
@@ -165,6 +166,20 @@ if [ $1 -eq 0 ] ; then
fi
+%package scm
+Summary: Collaborative development tool - shell accounts (using PostgreSQL)
+Requires: %{name}-common = %{version}-%{release}, %{name}-shell =
%{version}-%{release}
+%description shell
+FusionForge provides many tools to aid collaboration in a
+development project, such as bug-tracking, task management,
+mailing-lists, SCM repository, forums, support request helper,
+web/FTP hosting, release management, etc. All these services are
+integrated into one web site and managed through a web interface.
+
+This package manages SCM repositories.
+%files shell -f scm.rpmfiles
+
+
%package web
Summary: Collaborative development tool - web part (using Apache)
Requires: %{name}-common = %{version}-%{release}, %{name}-db =
%{version}-%{release}, httpd, mod_ssl, php, php-pgsql, php-simplepie,
php-pear-HTTP, php-nusoap, php-mbstring, httpd-itk, mod_dav_svn, unoconv,
poppler-utils
-----------------------------------------------------------------------
Summary of changes:
autoinstall/install-src.sh | 4 ++--
autoinstall/install.sh | 4 ++--
src/GNUmakefile | 14 +++++++++++---
src/debian/control.in | 13 +++++++++++++
src/debian/rules | 1 +
src/etc/cron.d/fusionforge-db | 8 +-------
src/etc/cron.d/fusionforge-scm | 11 +++++++++++
src/rpm/fusionforge.spec.in | 15 +++++++++++++++
8 files changed, 56 insertions(+), 14 deletions(-)
create mode 100644 src/etc/cron.d/fusionforge-scm
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
