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.1 has been updated
via aa2a1e73a8f0bcd6f0491343b4a37fe7cf0e4969 (commit)
from e28f9d2c613ab57844a90305834d242d59fe2b55 (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 -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=aa2a1e73a8f0bcd6f0491343b4a37fe7cf0e4969
commit aa2a1e73a8f0bcd6f0491343b4a37fe7cf0e4969
Author: Roland Mas <[email protected]>
Date: Tue Jan 12 18:42:14 2021 +0100
Make installation more resilient
diff --git a/src/GNUmakefile b/src/GNUmakefile
index 7ac32a5..c96b79a 100644
--- a/src/GNUmakefile
+++ b/src/GNUmakefile
@@ -94,7 +94,9 @@ install-db: install-base-dirs
> $(DESTDIR)$(sysconfdir)/cron.d/fusionforge-db; \
fi
-install-web-dirs: install-base-dirs
+install-web: install-base-dirs
+ $(CP_R) vendor www $(DESTDIR)$(pkgdatadir)/
+ $(CP_R) --no-clobber etc/httpd.conf* $(DESTDIR)$(config_path)
$(INSTALL) -d -m 00700 $(DESTDIR)$(data_path)/docman/
$(INSTALL) -d -m 00700 $(DESTDIR)$(data_path)/docman/review/
$(INSTALL) -d -m 00700 $(DESTDIR)$(data_path)/download/
@@ -102,10 +104,6 @@ install-web-dirs: install-base-dirs
$(INSTALL) -d -m 00700 $(DESTDIR)$(data_path)/forum/pending/
$(INSTALL) -d -m 00700 $(DESTDIR)$(data_path)/tracker/
$(INSTALL) -d -m 00700 $(DESTDIR)$(data_path)/rss/
-
-install-web: install-web-dirs
- $(CP_R) vendor www $(DESTDIR)$(pkgdatadir)/
- $(CP_R) --no-clobber etc/httpd.conf* $(DESTDIR)$(config_path)
$(CP_R) post-install.d/web $(DESTDIR)$(pkgdatadir)/post-install.d/
if [ ! -e $(DESTDIR)$(sysconfdir)/logrotate.d/fusionforge-web ]; then \
sed 's,@log_path@,$(log_path),g'
etc/logrotate.d/fusionforge-web \
@@ -193,7 +191,7 @@ 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: install-web-dirs
+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-ftp
@@ -275,6 +273,6 @@ dist-src-release:
echo $(VERSION) > $(TAR_PREFIX)/src/VERSION # if using e.g. make dist
VERSION=5.3.50+20141027
tar cjf $(TAR_PREFIX).tar.bz2 $(TAR_PREFIX)/
rm -rf $(TAR_PREFIX)/
-
+
version:
@echo $(VERSION)
diff --git a/src/post-install.d/web/web.sh b/src/post-install.d/web/web.sh
index 7693b5d..3021f4e 100755
--- a/src/post-install.d/web/web.sh
+++ b/src/post-install.d/web/web.sh
@@ -96,15 +96,23 @@ case "$1" in
# Setup Docman/FRS/Forum/Tracker/RSS attachments
# (not done in 'make install' because e.g. dpkg ignores
existing dirs, cf. DP10.9[1])
+ mkdir -p $data_path/docman/
chown $apache_user: $data_path/docman/
+ mkdir -p $data_path/docman/review/
chown $apache_user: $data_path/docman/review/
+ mkdir -p $data_path/download/
chown $apache_user: $data_path/download/
+ mkdir -p $data_path/forum/
chown $apache_user: $data_path/forum/
+ mkdir -p $data_path/forum/pending/
chown $apache_user: $data_path/forum/pending/
+ mkdir -p $data_path/tracker/
chown $apache_user: $data_path/tracker/
+ mkdir -p $data_path/rss/
chown $apache_user: $data_path/rss/
# Plugins activation from the web UI
+ mkdir -p $source_path/www/plugins/
chown $apache_user: $source_path/www/plugins/
# Enable required modules
-----------------------------------------------------------------------
Summary of changes:
src/GNUmakefile | 12 +++++-------
src/post-install.d/web/web.sh | 8 ++++++++
2 files changed, 13 insertions(+), 7 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
