[Fusionforge-commits] FusionForge branch master updated. dfae25c53cfe87e8a231958bdfbbc8cefd3efb67

Sylvain Beucler beuc-inria at fusionforge.org
Tue Mar 11 14:09:42 CET 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, master has been updated
       via  dfae25c53cfe87e8a231958bdfbbc8cefd3efb67 (commit)
       via  ab3cc26929c470173c9eb0d9a2d4befb7cecdcfb (commit)
      from  d1f58f1a655d8bc1eef83a0fd8b0d4197b3c298a (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 dfae25c53cfe87e8a231958bdfbbc8cefd3efb67
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Tue Mar 11 14:09:34 2014 +0100

    hudson: fix missing .ini file in the packaging

diff --git a/src/plugins/hudson/packaging/install/plugin-hudson b/src/plugins/hudson/packaging/install/plugin-hudson
index 82e0aa6..476c595 100644
--- a/src/plugins/hudson/packaging/install/plugin-hudson
+++ b/src/plugins/hudson/packaging/install/plugin-hudson
@@ -4,5 +4,6 @@ plugins/hudson/db/*                      @PLUGIN_PATH@/hudson/db/
 plugins/hudson/bin/*                     @PLUGIN_PATH@/hudson/bin/
 plugins/hudson/www/*                     @PLUGIN_PATH@/hudson/www/
 plugins/hudson/cronjobs/*                usr/share/gforge/cronjobs
-plugins/hudson/etc/plugins/hudson/*     etc/gforge/plugins/hudson/
+plugins/hudson/etc/plugins/hudson/*      etc/gforge/plugins/hudson/
 plugins/hudson/etc/httpd.d/*             usr/share/gforge/etc/httpd.d/
+plugins/hudson/etc/*.ini                 etc/@PACKAGE@/config.ini.d/

commit ab3cc26929c470173c9eb0d9a2d4befb7cecdcfb
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Tue Mar 11 13:49:27 2014 +0100

    VM: recommend private network

diff --git a/vm/scripts/README.txt b/vm/README
similarity index 100%
rename from vm/scripts/README.txt
rename to vm/README
diff --git a/vm/Vagrantfile-sample b/vm/Vagrantfile-sample
index 7fb5db6..0de1549 100644
--- a/vm/Vagrantfile-sample
+++ b/vm/Vagrantfile-sample
@@ -8,8 +8,10 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   #config.vm.box_url = "packer/fusionforge-dev-debian.box"
   config.vm.box_url = "http://fusionforge.fusionforge.org/sandbox/fusionforge-dev-debian.box"
 
-  config.vm.network :forwarded_port, guest: 80,  host: 8080
-  config.vm.network :forwarded_port, guest: 443, host: 8443
+  config.vm.network :private_network, ip: "192.168.35.11"
+  # Alternatively:
+  #config.vm.network :forwarded_port, guest: 80,  host: 8080
+  #config.vm.network :forwarded_port, guest: 443, host: 8443
 
   config.vm.provider :virtualbox do |vb|
       vb.gui = true

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

Summary of changes:
 src/plugins/hudson/packaging/install/plugin-hudson |    3 ++-
 vm/{scripts/README.txt => README}                  |    0
 vm/Vagrantfile-sample                              |    6 ++++--
 3 files changed, 6 insertions(+), 3 deletions(-)
 rename vm/{scripts/README.txt => README} (100%)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list