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 a44a4d5211c34f99e4c8992c5b1776aba46f03fd (commit)
via 5470439c481f79a9411906e30b13ec5ce0021162 (commit)
via bb26f2108a8535f7345c8d4e15ba51fabc9890c9 (commit)
via 36c136e6065f221c346b0a3b1785dfb8147a3528 (commit)
via 3c8d9afe9a4aa62b99e6ae1a0405cc2d94de3cff (commit)
via 9cc7f058436d1630550e0ee4c173f28e1e64cf7b (commit)
via c4a49473e081fe16dcb3dce7d6b0b889f56c606a (commit)
via a08e4909c1623bea37372b6d50cc00f5bd1bdf70 (commit)
via 7d7f6dcb19e9bbbf58d85755e24999e282d87fe3 (commit)
via 486a25f5cf5140ab1608b88198d390514906b48c (commit)
via 34aa48875d381681b531db3dfbd0e02a53668e25 (commit)
via f28c7d11079ea55fa1769b6b0aa35af04ea175af (commit)
via 3a2b67c7a78330834748d253dcde99f1e12dcd8d (commit)
via bb73eb4b712d494f7bc62ca2c6ef01bcd28bc4ee (commit)
via 646522613b3e15a844b78f544996a41dc3116b6f (commit)
via 79e4a8d5be31bb6a96e7a11640c35d03fe820bb0 (commit)
via df0a25954e1de76df2af858d3187aa9bdcaa2f7e (commit)
via 91014ebd9e05a4dfe97d609a78563f20b77f405a (commit)
via 4fff9f6d6befff61f18cea98ceba91dd3ea52851 (commit)
via bf825b5a8642a1f0e53d589a1bac2e18afb4a1cf (commit)
via 479c6c81c1f21637d2ac511f991d8fe3d4c80df6 (commit)
via 58e33da7716d646a8952332463bb0bbc0434049a (commit)
via 2998a5a57e4145408fbcb385f20c5de9f0b81a5b (commit)
from e7f2eca8be9e6c954581b8a9afc8ca31d91f59c7 (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 a44a4d5211c34f99e4c8992c5b1776aba46f03fd
Merge: e7f2eca 5470439
Author: Franck Villaume <[email protected]>
Date: Thu Mar 19 22:40:54 2015 +0100
Merge branch '6.0'
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 3 +-
autoinstall/uninstall.sh | 1 +
src/CHANGES | 2 +
src/GNUmakefile | 7 +-
src/common/include/User.class.php | 2 +-
src/common/include/config.php | 13 -
src/common/include/pre.php | 14 +-
src/common/include/system/pgsql.class.php | 25 +-
src/common/robots/scm.txt | 4 +
src/cronjobs/shell/homedirs.php | 3 +-
src/cronjobs/web-vhosts/create_vhosts.php | 1 -
src/db/20150316-nss.sql | 23 ++
src/debian/fusionforge-web.postinst | 9 +-
src/debian/fusionforge-web.postrm | 46 ---
src/debian/plugin.postinst | 9 +-
src/debian/plugin.postrm | 24 --
src/etc/config.ini.d/defaults.ini | 5 +
.../httpd.conf.d/01-namevhost.conf | 0
.../httpd.conf.d/02-config-main.conf | 0
.../httpd.conf.d/04-config-vendor.conf | 0
.../httpd.conf.d/05-config-macros-scm.conf | 0
.../httpd.conf.d/10-vhosts-main.conf | 0
.../httpd.conf.d/20-vhosts-lists.conf | 0
.../httpd.conf.d/20-vhosts-scm.conf | 0
.../httpd.conf.d/30-vhosts-projects.conf | 0
.../httpd.conf.d/40-vhosts-extra.conf | 0
.../httpd.conf.d/50-vhosts-scm.conf | 0
src/{templates => etc}/httpd.conf.d/auth-main.inc | 0
.../httpd.conf.d/auth-projects.inc | 0
.../httpd.conf.d/block-trace.inc | 0
.../httpd.conf.d/disable-scripts.inc | 0
src/{templates => etc}/httpd.conf.d/httpd.vhosts | 0
src/{templates => etc}/httpd.conf.d/log.inc | 0
.../httpd.conf.d/plugin-generic.inc | 0
.../httpd.conf.d/projects-in-mainvhost.inc | 0
src/{templates => etc}/httpd.conf.d/ssl-off.inc | 0
src/{templates => etc}/httpd.conf.d/ssl-on-scm.inc | 0
src/{templates => etc}/httpd.conf.d/ssl-on.inc | 0
.../httpd.conf.d/ssl-really-on.inc | 0
src/{templates => etc}/httpd.conf.d/vhost-list.inc | 0
src/{templates => etc}/httpd.conf.d/vhost-main.inc | 18 +-
.../httpd.conf.d/vhost-projects.inc | 0
src/{templates => etc}/httpd.conf.d/vhost-scm.inc | 25 +-
.../etc/httpd.conf.d/vhost-scm-plugin-scmsvn.inc | 9 +-
src/plugins/scmsvn/etc/scmsvn.ini | 2 +
.../scmsvn/libexec/{cgi-bin => }/viewvc.cgi | 0
src/plugins/scmsvn/www/redirect-to-itk.php | 6 +-
src/post-install.d/common/plugin.sh | 22 +-
src/post-install.d/common/user.sh | 5 +-
src/post-install.d/shell/shell.sh | 9 +-
src/post-install.d/web/web.sh | 40 +--
.../httpd.conf.d/post-install-secrets.inc | 23 --
src/www/pm/postuploadcsv.php | 2 +-
tests/func/.gitignore | 1 +
tests/func/50_PluginsScmGit/gitSmartHTTPTest.php | 6 +-
tests/func/db_reload.sh | 2 +-
vm/Vagrantfile-sample | 6 +-
vm/packer/fusionforge-dev-debian.json | 14 +-
vm/packer/http/preseed.cfg | 326 +++++++++++++++-----
vm/packer/scripts/base-debian.sh | 2 +-
vm/packer/scripts/fusionforge-source.sh | 12 +-
vm/packer/scripts/vagrant.sh | 4 +-
62 files changed, 397 insertions(+), 328 deletions(-)
create mode 100644 src/common/robots/scm.txt
create mode 100644 src/db/20150316-nss.sql
delete mode 100644 src/debian/fusionforge-web.postrm
delete mode 100644 src/debian/plugin.postrm
rename src/{templates => etc}/httpd.conf.d/01-namevhost.conf (100%)
rename src/{templates => etc}/httpd.conf.d/02-config-main.conf (100%)
rename src/{templates => etc}/httpd.conf.d/04-config-vendor.conf (100%)
rename src/{templates => etc}/httpd.conf.d/05-config-macros-scm.conf (100%)
rename src/{templates => etc}/httpd.conf.d/10-vhosts-main.conf (100%)
rename src/{templates => etc}/httpd.conf.d/20-vhosts-lists.conf (100%)
rename src/{templates => etc}/httpd.conf.d/20-vhosts-scm.conf (100%)
rename src/{templates => etc}/httpd.conf.d/30-vhosts-projects.conf (100%)
rename src/{templates => etc}/httpd.conf.d/40-vhosts-extra.conf (100%)
rename src/{templates => etc}/httpd.conf.d/50-vhosts-scm.conf (100%)
rename src/{templates => etc}/httpd.conf.d/auth-main.inc (100%)
rename src/{templates => etc}/httpd.conf.d/auth-projects.inc (100%)
rename src/{templates => etc}/httpd.conf.d/block-trace.inc (100%)
rename src/{templates => etc}/httpd.conf.d/disable-scripts.inc (100%)
rename src/{templates => etc}/httpd.conf.d/httpd.vhosts (100%)
rename src/{templates => etc}/httpd.conf.d/log.inc (100%)
rename src/{templates => etc}/httpd.conf.d/plugin-generic.inc (100%)
rename src/{templates => etc}/httpd.conf.d/projects-in-mainvhost.inc (100%)
rename src/{templates => etc}/httpd.conf.d/ssl-off.inc (100%)
rename src/{templates => etc}/httpd.conf.d/ssl-on-scm.inc (100%)
rename src/{templates => etc}/httpd.conf.d/ssl-on.inc (100%)
rename src/{templates => etc}/httpd.conf.d/ssl-really-on.inc (100%)
rename src/{templates => etc}/httpd.conf.d/vhost-list.inc (100%)
rename src/{templates => etc}/httpd.conf.d/vhost-main.inc (72%)
rename src/{templates => etc}/httpd.conf.d/vhost-projects.inc (100%)
rename src/{templates => etc}/httpd.conf.d/vhost-scm.inc (75%)
rename src/plugins/scmsvn/libexec/{cgi-bin => }/viewvc.cgi (100%)
delete mode 100644 src/templates/httpd.conf.d/post-install-secrets.inc
create mode 100644 tests/func/.gitignore
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
