[Fusionforge-commits] FusionForge branch feature/reactivity updated. 62965828d192d3398b82d663b2cfad317fe8ceaf

Sylvain Beucler beuc-inria at fusionforge.org
Wed Jan 7 12:19:10 CET 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, feature/reactivity has been updated
       via  62965828d192d3398b82d663b2cfad317fe8ceaf (commit)
       via  d75371a1fe00d02b7cdb1b495ad6f94bf7fe1247 (commit)
       via  64e0ff2fb6d258420b141e2eab20f9a942d563d6 (commit)
       via  1f2b2cecaf3b3f892c180bc6b9929173de7ac82f (commit)
       via  60204d439e32b2ee876de6ca035c18a819888b3f (commit)
       via  dc21991d760880e9c9d6eac5d79c70766f7aaa40 (commit)
       via  e0ac636cc40b1086136e8fd0fe641e0572e08c7f (commit)
       via  13a01838142e9ca5198aecdbe310114125e99936 (commit)
       via  4b203fbc2608e396398b9853f4aaaa7a6713914c (commit)
       via  1da968c426f3c69573540454beaf91ef0c0e6d77 (commit)
       via  dec8d16e2145238a910ddaed26797670f1c9dbfc (commit)
       via  da49b0010367b324d684c328657b16ebb411b6ce (commit)
       via  8ee7f3723aaaf2370e310ae9a58fb7760166996d (commit)
       via  9e5067c33804af319d5225d6b81c4a4d11987e88 (commit)
       via  64065707c3bce338dde4de65a97e2c92bb5c5505 (commit)
       via  24140875ef11e08512636d2af4c326269ca0cc20 (commit)
       via  aae0a097bcb2ef5f29257a245b2ddc0ab7d46ab5 (commit)
       via  2b2cfb4267d61a040483dae5076329761c5952cc (commit)
       via  38926b0fbf5f4629fe0f14443b99e182763268e6 (commit)
       via  bddfe3ea0816812fb9414f91950571283c73cde9 (commit)
       via  1a38a81f560a81cb444650dac4d540867ae5b9f1 (commit)
       via  bb3ff5d42cbcf4efc1f570394df83981e33cb2f8 (commit)
       via  9baebea861abd3f79494f3bb82351f04e834106e (commit)
       via  c06a6e8d8878d118ccabc356c53422b75ea1f7cd (commit)
       via  1791c451e1fc1bed16ac05394a4eaba937396d9b (commit)
       via  a805e1d8ac8f7a75b9f87ff0b4f473d3efe0036f (commit)
       via  2881c18035635183310418eca548c80aeb5a0349 (commit)
       via  1a46961f2278e7980b042a22498856eaa0fc3193 (commit)
       via  e9c184339030a4a44fb9d7e29ae6f9ce0227185c (commit)
       via  e8632e2497bcfd33c71ba4f2cd87b02a7e07a229 (commit)
       via  bd7797010a3a8d3391f02dfd1fa6a599a4a1a74d (commit)
       via  8c106cd72c769858a7a6bd7eaa095056979742d5 (commit)
       via  7852416929149b3c90f6c0ab5a01b910767702c0 (commit)
       via  c8654169d6f8d4b79b63ff47e8ce9a21a267b404 (commit)
       via  9d5421b3bff4a6e6eb6960101c6a748b3c945260 (commit)
       via  840703fe2204e9672383590b601d0424ce3da08c (commit)
       via  c0a8f05fb2d736ec02f621c6b6a369cc8e26a0ee (commit)
       via  d4fe3c05cbb33a7d325d8f77abe29a71efb91be3 (commit)
       via  ce95e81d235715ee230d1244c93fa75b2d2c1e78 (commit)
       via  24ec6e1ff46ba9461945ec892f3be2924843c7a4 (commit)
       via  9fd99fb97e7b3fd824998c532e76e4f5d5f9b421 (commit)
       via  39707a57e3f11baa28cc9f7344760fcb389d0d65 (commit)
       via  19bbd4fcb117b9da7eb6111372a8b0c98d715ece (commit)
       via  6015e32898bf51e680c7308bb28cf8fb3f1b28b1 (commit)
       via  fdd5d1b0d44ce003281c761480580d8911c54a78 (commit)
       via  44e61367e52609182a0d07e248e0ba7bd3c58175 (commit)
       via  07db7021f50f3e260e534d7d02d432f259962dd5 (commit)
       via  18167ecfc592a65603304a6b2f7c37cc9d1afc97 (commit)
       via  a8dc4e256ca9040c17510c30dda2794c8a4af700 (commit)
       via  83c630008e42fb32bfa1e66f458248d4b013cc78 (commit)
       via  4b182f86bcc620f955db713f87d27b1cab85bd49 (commit)
       via  f93b4b4b0a106b22d1ff117accab832d63b57576 (commit)
       via  7f1269806ead5149a1fbf757e3c220fd6da3351c (commit)
       via  3b533460275afd79bc840ef5453a72239566bfb7 (commit)
       via  1f7adf8273a5c5a2ef46d8816550fad63a9d6ca0 (commit)
       via  b566fdc8f60bd496cf961c7ecf1838162f2f3ec2 (commit)
       via  f50ea8c4f71748f07da1f9fd8b790e04d54eb5d8 (commit)
       via  af691f14a7e39500b8fc90a43b09cb4ca4e5506d (commit)
       via  63cd23e72c2272215bf0ad4173d1152ec783d097 (commit)
       via  38e2bff938c76e85696dfe5cd34181dc424c13b2 (commit)
       via  a7839b6a864b82c35384939a8feecd8b4ecc1915 (commit)
       via  d884167399fbe0844c50cf171d3de31d4ef922c5 (commit)
       via  2ac6672e4d616f9e31a46b5446496f3b7a55a645 (commit)
       via  7e026c448d1db6f4aa5ef21a6adc163534f91377 (commit)
       via  df1741378409f0edc9648da51771cb3adca39e2e (commit)
       via  4144d5fd9ffc1ea93fa1e49fd583955fffda9fc0 (commit)
       via  facadf8c555f9335974a327cc4675962e0d93250 (commit)
       via  e1ddafba00c98c6cc54f59b31e116a9f665a59a5 (commit)
       via  c8f5496e74afb9f50f236c6b6896534419547a5c (commit)
       via  a5fbbecc727e6b13f6148e0f229b27956e5e2acb (commit)
       via  b37cbf4e5cef086a849b681e0146173b2fea3262 (commit)
       via  db2ab82ce69a6488694dcca001fc99aeea26b0e4 (commit)
       via  164e574a55abda3908492fc287223b6ec1c586d8 (commit)
       via  4dc67c73fc7b07f808172d83633e958d032083ec (commit)
       via  f535c90ace97015491617a855bfb5ac1b57301e9 (commit)
       via  9b2b83c86c4416e4a6b9f296e5ae2b470b2d8df9 (commit)
       via  7d5dd2394596532ed42f28dde1772bb2f709d42b (commit)
       via  97937989563583256b3700fdaaeb24eee1e7b6d0 (commit)
       via  c68a91316cbc63a1caf50916877631e6b99a7271 (commit)
       via  8fd6ad8d7f65ce72a0b13e1d98a7c34307c693da (commit)
       via  e06ebb34deacd410195e916688335ba3473f526c (commit)
       via  bcb7927beb1394742512fdf60d258f156fccaf17 (commit)
       via  29ab12e64112c77175b4ca0de440421158494111 (commit)
       via  23b89b40ee53e0c70162b9144bd6e5bdbf6f274b (commit)
       via  9d6e7d8626610c7047f88979e7aebe8eaefafa85 (commit)
       via  a8a1f34497d75c98013db9cd9780650dcc607c73 (commit)
       via  34138380db9f474dc046dff413aed035625fc5ca (commit)
       via  a92efdab0e6a574b6633fdfdf277bf0d0a0d58d0 (commit)
       via  ae2a0de0a721589cdab3dd8d2d61657abae2715a (commit)
       via  e41db9f01319e22d0143c5f1a01fced7295f3bac (commit)
       via  a5c12bde52018554122d90b5d128a6e299fc9c59 (commit)
       via  4f419a2e700529d02b9e36e87b7bee4880e5e9db (commit)
       via  497c2c419031f1180e69aa69529778850fa192d0 (commit)
       via  2509fa3c6cdf4e00691ace04b397e5af1cf61c89 (commit)
       via  2cdba2241f817e6fdd7c87bace18f885cf352465 (commit)
       via  e15929faede183d81848e180377165dd861eb448 (commit)
       via  c2e864c08542265870a9868b64f448765b318574 (commit)
       via  1884ee8c42f55eba00edc0e87dcef7e5e411030d (commit)
       via  0fd98a0cec171121f31f3814ad934be558d31ce7 (commit)
       via  e0db310142c45c42ff8dec6d1a7d02bc65effd40 (commit)
       via  2a4729c81a312a7df69773af1797a732c1d93660 (commit)
       via  95b0f8ab732acdac13fffafd91ebf5950e5ef232 (commit)
       via  4e246934daf0fb5959a1e04c82cc7f4a1b56104d (commit)
       via  e5c23e29864196085924d42522f9a42b54364d32 (commit)
       via  232c58fb986273b49eb2e67ba36913e5052fa3f9 (commit)
       via  10c45f3b5e21e47f470e87dcb9987de367a43002 (commit)
       via  4a1177a820973c7848a4c861b94e31b347b9ca75 (commit)
       via  a7484c3828dc11fe5d2a469f264146d1cd178539 (commit)
       via  91357e522add6f548bc9dd2c84422de9b63ebcae (commit)
       via  39ae5f44bceda5276b6b515b81de3bc7140877bf (commit)
       via  5d425a4b4abc0bbc3fefb63896e42390ae894b80 (commit)
       via  c6273576d419c3e93fedb648a13f9fab15627ff5 (commit)
       via  52e4ee6f81f7ea96e88b3d2c6b1cd53e9573f2b0 (commit)
       via  78b1bd6d941ff77febbd78e155351b8264455140 (commit)
       via  5c17e766ff17ce93bac16761424e250c99ff78d0 (commit)
       via  2e27a0c6b80ef053be8524ed478576746cbc1f69 (commit)
       via  e522ad8e14b96bc6418ff7b4f9c248a80c4dd489 (commit)
       via  9b86b779abb2f0ac6b2e93fe6344b0a0e3099aaa (commit)
       via  d63c4ad0ece973768687277eb8e9cac97fd0eef1 (commit)
       via  65666a77aafa9722c92dba82e2ee7f0adb072142 (commit)
       via  b7c11cf4def54c07087519e29d9a7d70277e7ab2 (commit)
       via  575f901e13a21ce53242b8f2c659c8845eee5884 (commit)
       via  c8c404da630b3fc1505842f437d2f02ff35ee6df (commit)
       via  f839ffee0cbb3c12b7cdbc7810069d73ab2c4cea (commit)
       via  0e051ffc619b257ffaf7fba525d1753da8779318 (commit)
       via  cdf2a15d21014ccb4f65c93a7a2a6568be04c583 (commit)
       via  534e7e463f710b3251f99d57d81ea7fd20724c79 (commit)
       via  86e1dc2a6129ab17cf0818e4e80361522b940d3e (commit)
       via  6ee520eb6c2a5197299c15262e5377551d9d7eea (commit)
       via  b886d7bcb29f9eb02be58c7362f66b0617dc83d7 (commit)
       via  5aa9253b3a6382b1b0ea3b2fea3cde9185af0edf (commit)
       via  c31ec275641456630172ccc6e29b738b751f4f98 (commit)
       via  38483fab07918c32cf4e1af8bc9f89e17eebe79f (commit)
       via  644298a1db0223f0053ca4a0f2ff2c9864317b92 (commit)
       via  d30143b8911bcafb29de9e79bb8269f6f4bd0eaa (commit)
       via  92ee8cc82325d7e27657558d70cb259c10c1df09 (commit)
       via  6defcb43d696a496d5035bc5db2c21e819bf0108 (commit)
       via  4c124ad624c4401a588f6aa18abbe6cf64264dc7 (commit)
       via  34bbfcf5cae02cdba9dc08f379920c3801a72b13 (commit)
       via  c5ed49abf8aec3b512027d53998c06b74f947d06 (commit)
       via  cc6c33a6112d4a10b47f3114c580e20c3271e1f1 (commit)
       via  03c0a126bf575b5f2d45fca23770710ee3eb7cfb (commit)
       via  0b9bbfc40d1fc708cb01672654ee940c760d99c1 (commit)
       via  69edf22906c7780cb6786a6fbbf586af926ebf79 (commit)
       via  d6c98e5e44a3175ab0a769cfd9f906736ce1f461 (commit)
       via  03b163780baa76b842c27b6fea36081f72b1b350 (commit)
       via  1def23337f59a1b02fa347085035ac96ea2718c4 (commit)
       via  6fd492f799677962babfc85f0dab111f26ba048d (commit)
       via  8734bd05c7af584b6564993ec56116b552fb9bab (commit)
       via  3b1fbae0f50fb73abd89105dcffdee86f16f81fd (commit)
       via  f85de208a29bde3b550c223616b67e6f827f8b1c (commit)
       via  61076eb5e1b6146f47e36d7d0a20932658bec08e (commit)
       via  b05317bb5d42ad4ae1d16e42103cce0e0327353a (commit)
       via  2b68a9e0e4e039a492599612b44ed15a0765fb94 (commit)
       via  3b75f77cb980d1cc12638da859a9cfe235470180 (commit)
       via  9b223895a3d3e9e8fd0b8d93c4065cf9ca21ec5d (commit)
       via  9679f11da0035a565c1d10b466eea9e73d18ee39 (commit)
       via  8da92a2a1def9c4328df5a1961c6ad3e78db0097 (commit)
       via  383ae0ed4d8105f9d59f112e183b2f43a48b887e (commit)
       via  c5a9e3a4c186b61a2f47f3bf483dc0e30f518269 (commit)
       via  a20869fff0274a2dabfcd0b372da29379170f15a (commit)
       via  0b573bf22fd3d86f4b0d14a93cecd256256a9eda (commit)
       via  ccfb9d3d0c5a331a91728297523cca44c84b2c6f (commit)
       via  7827099eb2e178d78c2647c65dd00063aced1cd9 (commit)
       via  1b2a1a76fce0ed806ca1d8c6440353562e537609 (commit)
       via  d1727bed986fda14c3b130157b0eb0a7201a010c (commit)
       via  61f572557bf311106f0955ab85b74a60862e79c1 (commit)
       via  3f46cd864ec4d3ef4118ab5fc20e46c78fc26b08 (commit)
       via  c936df73391a3d31b3c0f552a94892e78499a2cb (commit)
       via  70de156a6b2a37c52153fd74dda8bf4deb86b8f4 (commit)
       via  127aac08e66e4ff3ce4a744f8cf3a2226632981f (commit)
       via  3abf3e79ce185064c5a1bc90f780c820995ec39c (commit)
       via  90e44063968488c741299192c95194bebd929f97 (commit)
       via  b5199fda4b10fe1608a82c4f5c7c8e66aa724b43 (commit)
       via  a536a0d772c3408a6e3e9868050073b0edeb252e (commit)
       via  c81100eae008e291b8a61821a5a689b06a753c97 (commit)
       via  78149e40eed73e243745d6f3979bf9da04749390 (commit)
       via  d702ef0d328248eae57b786b4daef2c8a6b2cb96 (commit)
       via  609fb709d65cdbc39b9cdefae56d37a51615a250 (commit)
       via  038f396663507dba365675ad0d28a5df9a3929ec (commit)
       via  40fb374214dfedf15a0201bb5d5f52aad18d6e08 (commit)
       via  9f53fc4ec2db07bc4eeb54862020c68f838b4122 (commit)
       via  b948ed65a1c21d9521261658d957c5077eb3ceb4 (commit)
       via  20e3461287450ef201dd8c477b875ef25e27d484 (commit)
       via  2dfdcaa55af4b0605e21f4db63a98a79338161b4 (commit)
       via  ba95d6f20234517e37cac16408428c796e6c10da (commit)
       via  9079c823a181311f0654e1112b9887cf4bd09776 (commit)
       via  70bb4293d38d3c228f70df984d93ccc46f0507c0 (commit)
       via  20274a58ade0f6f3083adbe3e9e5a6638136f5a1 (commit)
       via  3c9c62267bdd79100aa3f0752a6ac5689e5c43e7 (commit)
       via  ea66eaf7998ed253317cc52a8dab11e27baa1179 (commit)
       via  ed7e99677d4bb447dcfcf0002f7e663c0f2d8834 (commit)
       via  0e7ba9c7b369a1f07c029780ba228588f1e53207 (commit)
       via  79155aa0931f68b0d0619e1f12abace19dcc1379 (commit)
       via  576e112ce9cbb9951cfb28ca7a7f73c33ab96246 (commit)
       via  8d5d0d0adbedde00fbf378805dc75fbc32fe8cf5 (commit)
       via  90231352b099dedc898ad1490839d4365960e015 (commit)
       via  c71d718ca686afe159a5a76d0e1a21090a8ff357 (commit)
       via  662be565ee047c4e65c67d9caba136cf87c965f5 (commit)
       via  800667b48a4c22f4cec1460ba8fe13df0dfa86b7 (commit)
       via  31ceaf4760b22b868cba29da5ea3c7346d952199 (commit)
       via  48a332b656205da2293ce97256538f9c68eea09c (commit)
       via  a819ad52479fb48a0ad6ff36498c59fb441979f9 (commit)
       via  17fc6a3d079cd945846ff08cc90d8280969153cc (commit)
      from  f7a120e6d295ef24619d6cbd65906a02263111a2 (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 62965828d192d3398b82d663b2cfad317fe8ceaf
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Wed Jan 7 12:16:30 2015 +0100

    testsuite: rely on systasksd instead of manually running crons

diff --git a/tests/func/40_SSH/sshTest.php b/tests/func/40_SSH/sshTest.php
index 1c78ac5..4edb85d 100644
--- a/tests/func/40_SSH/sshTest.php
+++ b/tests/func/40_SSH/sshTest.php
@@ -30,7 +30,7 @@ class SSHTest extends FForge_SeleniumTestCase
 		$this->uploadSshKey();
 
 		// Run the cronjobs
-		$this->cron("shell/homedirs.php");
+		$this->waitSystasks();
 
 		$verbose = 0;
 		$v = '';
diff --git a/tests/func/50_PluginsScmGit/gitSSHTest.php b/tests/func/50_PluginsScmGit/gitSSHTest.php
index a290331..368239a 100644
--- a/tests/func/50_PluginsScmGit/gitSSHTest.php
+++ b/tests/func/50_PluginsScmGit/gitSSHTest.php
@@ -40,8 +40,7 @@ class ScmGitSSHTest extends FForge_SeleniumTestCase
 		$this->uploadSshKey();
 
 		// Run the cronjob to create repositories
-		$this->cron("scm/create_scm_repos.php");
-		$this->cron("shell/homedirs.php");
+		$this->waitSystasks();
 
 		// Get the address of the repo
 		$this->open(ROOT);
diff --git a/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php b/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php
index 9e4312f..d2b010e 100644
--- a/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php
+++ b/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php
@@ -41,10 +41,7 @@ class ScmGitSmartHTTPTest extends FForge_SeleniumTestCase
 		$this->clickAndWait("submit");
 
 		// Run the cronjob to create repositories
-		$this->cron("scm/create_scm_repos.php");
-		$this->cron("shell/homedirs.php");
-		$this->reload_apache();
-		$this->reload_nscd();
+		$this->waitSystasks();
 
 		// Get the address of the repo
 		$this->open(ROOT);
diff --git a/tests/func/50_PluginsScmGit/gitWUITest.php b/tests/func/50_PluginsScmGit/gitWUITest.php
index 19711a5..98f2703 100644
--- a/tests/func/50_PluginsScmGit/gitWUITest.php
+++ b/tests/func/50_PluginsScmGit/gitWUITest.php
@@ -52,7 +52,7 @@ class ScmGitWUITest extends FForge_SeleniumTestCase
 		$this->assertTextPresent("You have now requested a personal Git repository");
 
 		// Run the cronjob to create repositories
-		$this->cron("scm/create_scm_repos.php");
+		$this->waitSystasks();
 
 		$this->clickAndWait("link=SCM");
 		$this->assertTextPresent("Access to your personal repository");
diff --git a/tests/func/50_PluginsScmSvn/svnWebDAVTest.php b/tests/func/50_PluginsScmSvn/svnWebDAVTest.php
index 760b07b..1efc8c9 100644
--- a/tests/func/50_PluginsScmSvn/svnWebDAVTest.php
+++ b/tests/func/50_PluginsScmSvn/svnWebDAVTest.php
@@ -40,10 +40,7 @@ class ScmSvnWebDAVTest extends FForge_SeleniumTestCase
 		$this->clickAndWait("submit");
 
 		// Run the cronjob to create repositories
-		$this->cron("scm/create_scm_repos.php");
-		$this->cron("shell/homedirs.php");
-		$this->reload_apache();
-		$this->reload_nscd();
+		$this->waitSystasks();
 
 		// Get the address of the repo
 		$this->open(ROOT);
diff --git a/tests/func/55_PluginsScmMulti/multiSCMTest.php b/tests/func/55_PluginsScmMulti/multiSCMTest.php
index 91e560c..cf9590e 100644
--- a/tests/func/55_PluginsScmMulti/multiSCMTest.php
+++ b/tests/func/55_PluginsScmMulti/multiSCMTest.php
@@ -49,8 +49,7 @@ class multiSCMTest extends FForge_SeleniumTestCase
 		$this->uploadSshKey();
 
 		// Run the cronjob to create repositories
-		$this->cron("scm/create_scm_repos.php");
-		$this->cron("shell/homedirs.php");
+		$this->waitSystasks();
 
         // Check Bazaar commit/push
 		$this->open(ROOT);
diff --git a/tests/func/Testing/SeleniumForge.php b/tests/func/Testing/SeleniumForge.php
index 456d0de..12c7a25 100644
--- a/tests/func/Testing/SeleniumForge.php
+++ b/tests/func/Testing/SeleniumForge.php
@@ -145,18 +145,6 @@ class FForge_SeleniumTestCase extends PHPUnit_Extensions_SeleniumTestCase
 		$this->runCommand(RUN_JOB_PATH.'/systasks_wait_until_empty.php');
 	}
 
-	protected function reload_apache()
-	{
-		$this->runCommand("service apache2 reload > /dev/null 2>&1 || service httpd reload > /dev/null 2>&1");
-		sleep (5); // Give it some time to become available again
-	}
-
-	protected function reload_nscd()
-	{
-		$this->runCommand("service unscd restart > /dev/null 2>&1 || service nscd restart > /dev/null 2>&1 || true");
-		sleep (5); // Give it some time to wake up
-	}
-
 	protected function init() {
 		$this->createAndGoto('ProjectA');
 	}

commit d75371a1fe00d02b7cdb1b495ad6f94bf7fe1247
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Wed Jan 7 12:15:39 2015 +0100

    reactivity: reload apache along with nscd, required by itk

diff --git a/src/bin/systasksd b/src/bin/systasksd
index 01cc60e..f55baa5 100755
--- a/src/bin/systasksd
+++ b/src/bin/systasksd
@@ -50,6 +50,7 @@ function usergroups_sync() {
 		$row = db_fetch_array($res);
 		if ($row['lastmodified'] > $usergroups_lastsync) {
 				cron_reload_nscd();
+				cron_reload_apache();
 				$hook_params = array();
 				plugin_hook("usergroups_sync", $hook_params);
 				$usergroups_lastsync = time();
diff --git a/src/common/include/cron_utils.php b/src/common/include/cron_utils.php
index 4f6995d..55a4805 100644
--- a/src/common/include/cron_utils.php
+++ b/src/common/include/cron_utils.php
@@ -154,6 +154,10 @@ function cron_reload_nscd() {
         system("(nscd -i passwd && nscd -i group) >/dev/null 2>&1");
 }
 
+function cron_reload_apache() {
+        system("service apache2 reload || service httpd reload >/dev/null 2>&1");
+}
+
 // Local Variables:
 // mode: php
 // c-file-style: "bsd"

commit 64e0ff2fb6d258420b141e2eab20f9a942d563d6
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Wed Jan 7 12:14:53 2015 +0100

    install: create /etc/init.d/ for use with DESTDIR/packaged-install

diff --git a/src/GNUmakefile b/src/GNUmakefile
index a4390bb..6bf5294 100644
--- a/src/GNUmakefile
+++ b/src/GNUmakefile
@@ -75,6 +75,7 @@ install-common: install-config install-plugin-authbuiltin
 	ln -nfs $(pkgdatadir)/bin/forge_run_plugin_job $(DESTDIR)$(bindir)
 	ln -nfs $(pkgdatadir)/bin/forge_make_admin $(DESTDIR)$(bindir)
 	ln -nfs $(pkgdatadir)/bin/forge_set_password $(DESTDIR)$(bindir)
+	$(INSTALL) -d -m 00755 $(DESTDIR)$(sysconfdir)/init.d/
 	$(CP_R) etc/init.d/fusionforge-systasksd $(DESTDIR)$(sysconfdir)/init.d/
 	$(INSTALL) -d -m 00755 $(DESTDIR)$(log_path)/
 

commit 1f2b2cecaf3b3f892c180bc6b9929173de7ac82f
Merge: f7a120e 60204d4
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Wed Jan 7 12:11:14 2015 +0100

    Merge remote-tracking branch 'origin/master' into feature/reactivity

diff --cc tests/func/50_PluginsScmSvn/svnSSHTest.php
index c589571,95b0ddb..0494cb2
--- a/tests/func/50_PluginsScmSvn/svnSSHTest.php
+++ b/tests/func/50_PluginsScmSvn/svnSSHTest.php
@@@ -40,9 -40,10 +40,9 @@@ class ScmSvnSSHTest extends FForge_Sele
  		$this->clickAndWait("submit");
  
  		$this->uploadSshKey();
- 	    
+ 
  		// Run the cronjob to create repositories
 -		$this->cron("scm/create_scm_repos.php");
 -		$this->cron("shell/homedirs.php");
 +		$this->waitSystasks();
  
  		// Get the address of the repo
  		$this->open(ROOT);

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

Summary of changes:
 autoinstall/common-backports                       |  187 +++++++++++++--
 autoinstall/debian-backports-itk2.4.sh             |  245 ++++++++++++++++++++
 autoinstall/install-src.sh                         |    3 +-
 src/CHANGES                                        |    9 +-
 src/GNUmakefile                                    |    1 +
 src/GNUmakefile.defaults                           |    1 +
 src/bin/systasksd                                  |    1 +
 src/common/docman/Parsedata.class.php              |    4 +-
 src/common/docman/engine/parser_html.php           |    2 +-
 src/common/docman/engine/parser_pdf.inc.php        |    1 -
 src/common/docman/engine/parser_pdf.php            |    2 +-
 src/common/docman/engine/parser_text.php           |    2 +-
 .../docman/engine/parser_unoconv_document.php      |    4 +-
 .../docman/engine/parser_unoconv_presentation.php  |    4 +-
 .../docman/engine/parser_unoconv_spreadsheet.php   |    4 +-
 src/common/docman/include/webdav.php               |    2 +-
 src/common/docman/views/reporting.php              |    5 +-
 src/common/docman/views/search.php                 |    4 +-
 src/common/frs/FRSRelease.class.php                |    8 +-
 src/common/frs/views/reporting.php                 |    2 +-
 src/common/include/Plugin.class.php                |   12 +-
 src/common/include/RBACEngine.class.php            |   32 +++
 src/common/include/cron_utils.php                  |    4 +
 src/common/reporting/report_utils.php              |  103 ++++----
 src/common/tracker/Artifact.class.php              |    2 +-
 src/common/tracker/actions/mod-limited.php         |    2 +-
 .../widget/Widget_ProjectLatestDocuments.class.php |    2 +-
 .../Widget_ProjectLatestFileReleases.class.php     |    2 +-
 ...ivityvw.sql => 20141219-fix-frs-activityvw.sql} |    7 +-
 src/debian/changelog                               |   18 ++
 src/debian/control.in                              |    6 +-
 src/debian/plugins                                 |    2 +-
 .../headermenu/common/headermenuPlugin.class.php   |   14 +-
 .../view/admin/viewGlobalConfiguration.php         |    2 +-
 .../mantisbt/common/MantisBTPlugin.class.php       |   12 +-
 src/plugins/mantisbt/view/viewIssue.php            |    2 +-
 src/plugins/mantisbt/view/viewIssues.php           |    7 +-
 src/plugins/mediawiki/www/LocalSettings.php        |   19 +-
 .../common/projects-hierarchyPlugin.class.php      |   12 +-
 .../projects-hierarchy/view/admin_project_link.php |   29 ++-
 src/plugins/scmgit/GNUmakefile                     |   11 +
 src/plugins/scmgit/common/GitPlugin.class.php      |  169 ++++++++++++--
 .../etc/httpd.conf.d/05-config-macros-scmgit.conf  |   31 +++
 .../scmgit/etc/httpd.conf.d/plugin-scmgit.inc      |   13 ++
 .../etc/httpd.conf.d/vhost-scm-plugin-scmgit.inc   |    2 +
 src/plugins/scmgit/etc/scmgit.ini                  |    3 +-
 src/plugins/scmhg/common/HgPlugin.class.php        |   12 +-
 src/plugins/scmhook/common/scmhookPlugin.class.php |    5 +-
 src/plugins/scmsvn/bin/install.sh                  |    6 +
 src/plugins/scmsvn/common/SVNPlugin.class.php      |   23 +-
 .../etc/httpd.conf.d/05-config-macros-scmsvn.conf  |   25 ++
 .../etc/httpd.conf.d/vhost-scm-plugin-scmsvn.inc   |    2 +
 src/plugins/scmsvn/etc/scmsvn.ini                  |    2 +-
 .../common/webanalyticsPlugin.class.php            |   13 +-
 src/post-install.d/web/web.sh                      |   20 +-
 src/rpm/fusionforge.spec.in                        |    2 +-
 .../{50-vhosts-scm.conf => 20-vhosts-scm.conf}     |    2 +-
 .../{ssl-really-on.inc => ssl-on-scm.inc}          |    2 +-
 src/templates/httpd.conf.d/vhost-scm.inc           |   10 +
 src/templates/post-install-secrets.ini             |    3 +-
 src/www/admin/pluginman.php                        |   76 +++---
 src/www/include/Layout.class.php                   |   17 +-
 src/www/include/html.php                           |   30 +--
 src/www/include/tool_reports.php                   |    2 +-
 src/www/project/admin/users.php                    |   36 +--
 src/www/scm/admin/index.php                        |    2 -
 src/www/scm/include/scm_utils.php                  |    4 +-
 src/www/scm/reporting/index.php                    |    1 -
 src/www/scm/viewvc.php                             |   34 +--
 src/www/softwaremap/full_list.php                  |   43 ++--
 src/www/softwaremap/tag_cloud.php                  |    2 +-
 src/www/softwaremap/trove_list.php                 |   84 +++----
 src/www/stats/site_stats_utils.php                 |   36 +--
 tests/func/10_Site/loginTest.php                   |    6 +-
 tests/func/10_Site/projectsTest.php                |    2 +-
 tests/func/10_Site/topTest.php                     |   58 ++---
 tests/func/10_Site/troveTest.php                   |    2 +-
 tests/func/20_Docs/createDocURLTest.php            |    4 +-
 tests/func/20_Forums/forumsTest.php                |   10 +-
 tests/func/20_News/newsTest.php                    |    8 +-
 tests/func/20_Surveys/surveysTest.php              |    4 +-
 tests/func/20_Tasks/createTaskTest.php             |    4 +-
 tests/func/20_Trackers/relationTest.php            |    4 +-
 tests/func/20_Trackers/trackersTest.php            |    4 +-
 tests/func/20_Trackers/workflowTest.php            |    4 +-
 tests/func/30_Search/searchTest.php                |    1 -
 tests/func/40_SSH/sshTest.php                      |   10 +-
 tests/func/50_PluginsScmBzr/bzrTest.php            |   25 +-
 tests/func/50_PluginsScmGit/gitSSHTest.php         |   13 +-
 .../{gitSSHTest.php => gitSmartHTTPTest.php}       |   41 ++--
 tests/func/50_PluginsScmGit/gitWUITest.php         |   20 +-
 tests/func/50_PluginsScmSvn/svnSSHTest.php         |   14 +-
 tests/func/50_PluginsScmSvn/svnWUITest.php         |   12 +-
 .../{svnSSHTest.php => svnWebDAVTest.php}          |   49 ++--
 tests/func/55_PluginsScmMulti/multiSCMTest.php     |   25 +-
 tests/func/60_PluginsBlocks/blocksTest.php         |   92 ++++----
 tests/func/60_PluginsMediawiki/mediawikiTest.php   |    8 +-
 tests/func/60_PluginsMoinMoin/moinmoinTest.php     |    8 +-
 .../60_PluginsOnlineHelp/contextualHelpTest.php    |    6 +-
 tests/func/70_SOAP/soapTest.php                    |  159 +++++++------
 tests/func/Testing/SeleniumForge.php               |   26 +--
 tests/func/Testing/SeleniumRemoteSuite.php         |   17 ++
 102 files changed, 1390 insertions(+), 749 deletions(-)
 create mode 100755 autoinstall/debian-backports-itk2.4.sh
 copy src/db/{20140215-task-activityvw.sql => 20141219-fix-frs-activityvw.sql} (95%)
 create mode 100644 src/plugins/scmgit/GNUmakefile
 create mode 100644 src/plugins/scmgit/etc/httpd.conf.d/05-config-macros-scmgit.conf
 create mode 100644 src/plugins/scmgit/etc/httpd.conf.d/vhost-scm-plugin-scmgit.inc
 create mode 100644 src/plugins/scmsvn/etc/httpd.conf.d/05-config-macros-scmsvn.conf
 create mode 100644 src/plugins/scmsvn/etc/httpd.conf.d/vhost-scm-plugin-scmsvn.inc
 copy src/templates/httpd.conf.d/{50-vhosts-scm.conf => 20-vhosts-scm.conf} (90%)
 copy src/templates/httpd.conf.d/{ssl-really-on.inc => ssl-on-scm.inc} (91%)
 copy tests/func/50_PluginsScmGit/{gitSSHTest.php => gitSmartHTTPTest.php} (72%)
 copy tests/func/50_PluginsScmSvn/{svnSSHTest.php => svnWebDAVTest.php} (60%)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list