[Fusionforge-commits] FusionForge branch 6.0 updated. v6.0.2-80-ge41f280
Sylvain Beucler
beuc-inria at libremir.placard.fr.eu.org
Tue Sep 8 17:16:46 CEST 2015
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 e41f2800f279a3a91c1772a07f5d3ccbff1b8aea (commit)
via 23b2744afa7449331e41dd7b782a8d918c1d2d36 (commit)
via 6029573fc4fd53d4176817dd62270c49cdcf0c2c (commit)
via 1057fd6e7a381120fc1fb862c81205cfa095f5fe (commit)
from a82ce44786c4b53847312af3628198a568865138 (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=e41f2800f279a3a91c1772a07f5d3ccbff1b8aea
commit e41f2800f279a3a91c1772a07f5d3ccbff1b8aea
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date: Tue Sep 8 16:53:52 2015 +0200
install: add dependency to openssl for web.sh's default self-signed certificates
diff --git a/src/debian/changelog b/src/debian/changelog
index e98b9c7..111f7bc 100644
--- a/src/debian/changelog
+++ b/src/debian/changelog
@@ -1,3 +1,12 @@
+fusionforge (6.0.2+20150908-1) unstable; urgency=medium
+
+ * New upstream snapshot following the 6.0 stable branch
+ * fusionforge-web: add dependency to 'openssl' for the hypothetical case
+ somebody installs fusionforge without postgresql, postfix nor unoconv
+ (closes: #798363)
+
+ -- Sylvain Beucler <beuc at debian.org> Tue, 08 Sep 2015 16:50:55 +0200
+
fusionforge (6.0.2+20150901-1) unstable; urgency=medium
* New upstream snapshot following the 6.0 stable branch
diff --git a/src/debian/control.in b/src/debian/control.in
index 89cf2b1..a71a36e 100644
--- a/src/debian/control.in
+++ b/src/debian/control.in
@@ -79,7 +79,7 @@ Description: collaborative development tool - database (remote)
Package: fusionforge-web
Architecture: all
-Depends: fusionforge-common (=${source:Version}), fusionforge-db, libapache2-mpm-itk | apache2-mpm-itk, php5-cli, libapache2-mod-php5, libphp-simplepie, php-http, php-http-webdav-server, libjs-jquery-livequery, python, poppler-utils, ${misc:Depends}
+Depends: fusionforge-common (=${source:Version}), fusionforge-db, libapache2-mpm-itk | apache2-mpm-itk, php5-cli, libapache2-mod-php5, libphp-simplepie, php-http, php-http-webdav-server, libjs-jquery-livequery, python, poppler-utils, openssl, ${misc:Depends}
Recommends: locales-all, unoconv
Description: collaborative development tool - web part (using Apache)
FusionForge provides many tools to aid collaboration in a
diff --git a/src/rpm/fusionforge.spec.in b/src/rpm/fusionforge.spec.in
index f24a330..5cd629c 100644
--- a/src/rpm/fusionforge.spec.in
+++ b/src/rpm/fusionforge.spec.in
@@ -183,7 +183,7 @@ It should be installed on only one server in your infrastructure.
%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
+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, openssl
%description web
FusionForge provides many tools to aid collaboration in a
development project, such as bug-tracking, task management,
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=23b2744afa7449331e41dd7b782a8d918c1d2d36
commit 23b2744afa7449331e41dd7b782a8d918c1d2d36
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date: Tue Sep 8 16:29:20 2015 +0200
vm: GUI support for CentOS
diff --git a/autoinstall/install-gui.sh b/autoinstall/install-gui.sh
index 9d7dc04..c403dbf 100755
--- a/autoinstall/install-gui.sh
+++ b/autoinstall/install-gui.sh
@@ -1,5 +1,13 @@
-#! /bin/sh
+#!/bin/bash
-apt-get install -y xorg nodm xfce4 gnome-icon-theme
-sed -i -e 's/^NODM_ENABLED=.*/NODM_ENABLED=true/' -e 's/^NODM_USER=.*/NODM_USER=root/' /etc/default/nodm
-/etc/init.d/nodm restart
+if [ -e /etc/debian_version ]; then
+ apt-get install -y xorg nodm xfce4 gnome-icon-theme
+ sed -i -e 's/^NODM_ENABLED=.*/NODM_ENABLED=true/' -e 's/^NODM_USER=.*/NODM_USER=root/' /etc/default/nodm
+ /etc/init.d/nodm restart
+else
+ yum -y groupinstall 'X Window system'
+ yum -y --enablerepo=epel groupinstall xfce
+ yum -y install xfce4-terminal
+ systemctl set-default graphical.target
+ systemctl isolate graphical.target
+fi
diff --git a/vm/packer/fusionforge-dev-centos.json b/vm/packer/fusionforge-dev-centos.json
index 1a29fe4..f258bd8 100644
--- a/vm/packer/fusionforge-dev-centos.json
+++ b/vm/packer/fusionforge-dev-centos.json
@@ -2,6 +2,11 @@
"provisioners": [
{
"type": "file",
+ "source": "file/Desktop",
+ "destination": "/root/"
+ },
+ {
+ "type": "file",
"source": "file/bashrc-rpm",
"destination": "/root/.bashrc"
},
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=6029573fc4fd53d4176817dd62270c49cdcf0c2c
commit 6029573fc4fd53d4176817dd62270c49cdcf0c2c
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date: Tue Sep 8 15:47:19 2015 +0200
vm: refresh CentOS box
diff --git a/vm/packer/fusionforge-dev-centos.json b/vm/packer/fusionforge-dev-centos.json
index 4351910..1a29fe4 100644
--- a/vm/packer/fusionforge-dev-centos.json
+++ b/vm/packer/fusionforge-dev-centos.json
@@ -27,9 +27,9 @@
"disk_size": 10140,
"guest_os_type": "RedHat_64",
"http_directory": "http",
- "iso_checksum": "0d9dc37b5dd4befa1c440d2174e88a87",
- "iso_checksum_type": "md5",
- "iso_url": "http://yum.singlehop.com/CentOS/6.5/isos/x86_64/CentOS-6.5-x86_64-minimal.iso",
+ "iso_url": "http://ftp.ciril.fr/pub/linux/centos/7/isos/x86_64/CentOS-7-x86_64-Minimal-1503-01.iso",
+ "iso_checksum": "7cf1ac8da13f54d6be41e3ccf228dc5bb35792f515642755ff4780d5714d4278",
+ "iso_checksum_type": "sha256",
"ssh_username": "root",
"ssh_password": "vagrant",
"ssh_port": 22,
@@ -51,13 +51,13 @@
"1"
]
],
- "vm_name": "fusionforge-dev-centos"
+ "vm_name": "fusionforge-dev-centos7"
}
],
"post-processors": [
{
"type": "vagrant",
- "output": "fusionforge-dev-centos.box"
+ "output": "fusionforge-dev-centos7.box"
}
]
}
diff --git a/vm/packer/scripts/cleanup-centos.sh b/vm/packer/scripts/cleanup-centos.sh
index a034ee7..da9ed95 100644
--- a/vm/packer/scripts/cleanup-centos.sh
+++ b/vm/packer/scripts/cleanup-centos.sh
@@ -1,6 +1,2 @@
yum -y clean all
yum -y install gpm bzip2 rsync emacs-nox vim
-
-# Remove traces of mac address from network configuration
-sed -i /HWADDR/d /etc/sysconfig/network-scripts/ifcfg-eth0
-rm /etc/udev/rules.d/70-persistent-net.rules
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=1057fd6e7a381120fc1fb862c81205cfa095f5fe
commit 1057fd6e7a381120fc1fb862c81205cfa095f5fe
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date: Tue Sep 8 14:43:59 2015 +0200
testsuite: stop/start fusionforge-systasksd for safety during fixture reload
diff --git a/tests/func/fixtures.sh b/tests/func/fixtures.sh
index 0f7a249..31e6c62 100755
--- a/tests/func/fixtures.sh
+++ b/tests/func/fixtures.sh
@@ -151,6 +151,7 @@ fi
# Else, restore clean state
+service fusionforge-systasksd stop
stop_apache
stop_database --force
@@ -191,13 +192,11 @@ else
exit 2
fi
-start_database
-start_apache
-
if [ -x /usr/sbin/nscd ]; then
echo "Flushing/restarting nscd"
nscd -i passwd && nscd -i group
fi
-# We may have changed plugins.plugin_id, need to reload the systasksd
-service fusionforge-systasksd restart
+start_database
+start_apache
+service fusionforge-systasksd start
-----------------------------------------------------------------------
Summary of changes:
autoinstall/install-gui.sh | 16 ++++++++++++----
src/debian/changelog | 9 +++++++++
src/debian/control.in | 2 +-
src/rpm/fusionforge.spec.in | 2 +-
tests/func/fixtures.sh | 9 ++++-----
vm/packer/fusionforge-dev-centos.json | 15 ++++++++++-----
vm/packer/scripts/cleanup-centos.sh | 4 ----
7 files changed, 37 insertions(+), 20 deletions(-)
hooks/post-receive
--
FusionForge
More information about the Fusionforge-commits
mailing list