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 39c07f0f173f4788f811f117ae8e32dd50975cd2 (commit)
via 07a94fd6a903d348362dc051ef763e6d91f96972 (commit)
from e31a0da9e952edec76bae8e6ff473cbcf2acc396 (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 39c07f0f173f4788f811f117ae8e32dd50975cd2
Author: Sylvain Beucler <[email protected]>
Date: Wed Apr 8 11:57:05 2015 +0200
install: introduce bin/post-install.sh convenience script to configure all
*installed* components
diff --git a/autoinstall/install-src.sh b/autoinstall/install-src.sh
index 477d61a..e35afd1 100755
--- a/autoinstall/install-src.sh
+++ b/autoinstall/install-src.sh
@@ -58,10 +58,7 @@ fi
install-plugin-scmsvn install-plugin-scmgit \
install-plugin-blocks install-plugin-mediawiki install-plugin-moinmoin
\
install-plugin-online_help install-plugin-taskboard
- 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 post-install-plugin-taskboard
+ make post-install
)
# Dump clean DB
diff --git a/src/GNUmakefile b/src/GNUmakefile
index 7c5aaf6..bbbdc12 100644
--- a/src/GNUmakefile
+++ b/src/GNUmakefile
@@ -110,10 +110,6 @@ install-web-vhosts: install-base-dirs
$(CP_R) cronjobs/web-vhosts $(DESTDIR)$(pkgdatadir)/cronjobs/
# TODO: only install 40-vhosts-extra.conf and httpd.vhosts with this
module
-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/
$(INSTALL) -d -m 00755 $(DESTDIR)$(sysconfdir)/xinetd.d/
@@ -123,6 +119,10 @@ install-scm: install-base-dirs
> $(DESTDIR)$(sysconfdir)/cron.d/fusionforge-scm; \
fi
+install-shell: install-base-dirs
+ $(CP_R) cronjobs/shell $(DESTDIR)$(pkgdatadir)/cronjobs/
+ $(CP_R) post-install.d/shell $(DESTDIR)$(pkgdatadir)/post-install.d/
+
install-mta-postfix: install-base-dirs
$(CP_R) post-install.d/mta-postfix
$(DESTDIR)$(pkgdatadir)/post-install.d/
@@ -136,7 +136,7 @@ install-lists: install-base-dirs
install-base: install-base-dirs install-common install-web install-db
install-scm
# Select only "valid" plugins for 'make install'
-PLUGINS=$(shell grep 'plugin_status\s=\svalid' plugins/*/etc/*.ini | sed
's,plugins/\([^/]*\)/.*,\1,')
+PLUGINS=$(shell grep -l '^plugin_status\s=\svalid' plugins/*/etc/*.ini | sed
's,plugins/\([^/]*\)/.*,\1,')
PLUGINS_INSTALL_TARGETS=$(addprefix install-plugin-,$(PLUGINS))
install-plugins: $(PLUGINS_INSTALL_TARGETS)
@@ -173,7 +173,8 @@ uninstall:
# not relying on 'prefix' for post-install (for no-install/dev setups)
post_source_path:=$(shell forge_get_config source_path 2>/dev/null)
post_plugins_path:=$(shell forge_get_config plugins_path 2>/dev/null)
-post-install: post-install-base post-install-plugins
+post-install:
+ $(post_source_path)/bin/post-install.sh
post-install-base: post-install-common post-install-db post-install-web
post-install-scm
post-install-common:
$(post_source_path)/post-install.d/common/common.sh configure
@@ -181,11 +182,11 @@ post-install-db:
$(post_source_path)/post-install.d/db/db.sh configure
post-install-web:
$(post_source_path)/post-install.d/web/web.sh configure
+post-install-scm:
+# nothing yet
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:
diff --git a/src/bin/post-install.sh b/src/bin/post-install.sh
new file mode 100755
index 0000000..015db25
--- /dev/null
+++ b/src/bin/post-install.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+# Run all post-install scripts for *installed* components
+#
+# Copyright (C) 2015 Inria (Sylvain Beucler)
+#
+# This file is part of FusionForge. FusionForge is free software;
+# you can redistribute it and/or modify it under the terms of the
+# GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the Licence, or (at your option)
+# any later version.
+#
+# FusionForge is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with FusionForge; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+#set -x
+set -e
+
+source_path=$(forge_get_config source_path)
+plugins_path=$(forge_get_config plugins_path)
+
+# Base
+for i in common db web scm shell lists mta-postfix mta-exim4; do
+ script="$source_path/post-install.d/$i/$i.sh"
+ [ -x $script ] && $script configure
+done
+
+# Plugins
+if [ -d "$plugins_path" ]; then
+ for i in $(cd $plugins_path && find * -maxdepth 0 -type d); do
+ $source_path/post-install.d/common/plugin.sh $i configure
+ done
+fi
diff --git a/src/rpm/README.fedora b/src/rpm/README.fedora
index e8c362c..4cf9b43 100644
--- a/src/rpm/README.fedora
+++ b/src/rpm/README.fedora
@@ -9,23 +9,9 @@ You may also need to re-run these manually in case the initial
installation fails (e.g. you configured a remote database which got
down during install).
-For a FusionForge main package, use:
+You can run all the post-install scripts for installed components
+using:
- /usr/share/fusionforge/post-install.d/<pkg_name>/<pkg_name>.sh configure
-
-and for plugins use:
-
- /usr/share/fusionforge/post-install.d/common/plugin.sh <plugin_name>
configure
-
-E.g.:
-
- /usr/share/fusionforge/post-install.d/common/common.sh configure
- /usr/share/fusionforge/post-install.d/db/db.sh configure
- /usr/share/fusionforge/post-install.d/web/web.sh configure
- /usr/share/fusionforge/post-install.d/shell/shell.sh configure
- /usr/share/fusionforge/post-install.d/mta-postfix/mta-postfix.sh configure
- /usr/share/fusionforge/post-install.d/common/plugin.sh scmgit configure
- /usr/share/fusionforge/post-install.d/common/plugin.sh scmsvn configure
- ...
+ /usr/share/fusionforge/bin/post-install.sh
Post-install scripts are idempotent and can safely be run multiple times.
commit 07a94fd6a903d348362dc051ef763e6d91f96972
Author: Sylvain Beucler <[email protected]>
Date: Wed Apr 8 11:54:46 2015 +0200
Fix bad copy/paste
diff --git a/src/plugins/scmdarcs/etc/httpd.conf.d/plugin-scmdarcs.inc
b/src/plugins/scmdarcs/etc/httpd.conf.d/plugin-scmdarcs.inc
index b5327c0..4a6cd87 100644
--- a/src/plugins/scmdarcs/etc/httpd.conf.d/plugin-scmdarcs.inc
+++ b/src/plugins/scmdarcs/etc/httpd.conf.d/plugin-scmdarcs.inc
@@ -5,5 +5,4 @@ Alias ${FF__core__url_prefix}anonscm/darcs
${FF__scmdarcs__repos_path}
<Directory ${FF__core__plugins_path}/scmdarcs/cgi-bin>
SetEnv DARCSWEB_CONFPATH ${FF__core__config_path}/plugins/scmdarcs/
-e their variability
</Directory>
-----------------------------------------------------------------------
Summary of changes:
autoinstall/install-src.sh | 5 +----
src/GNUmakefile | 17 ++++++++-------
.../common/common.sh => bin/post-install.sh} | 23 +++++++++++++++-----
.../scmdarcs/etc/httpd.conf.d/plugin-scmdarcs.inc | 1 -
src/rpm/README.fedora | 20 +++--------------
5 files changed, 31 insertions(+), 35 deletions(-)
copy src/{post-install.d/common/common.sh => bin/post-install.sh} (60%)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
