[evolvis-commits] r18542: merge upstream and evolvis SVN changes
mirabilos at evolvis.org
mirabilos at evolvis.org
Fri Sep 7 18:49:30 CEST 2012
Author: mirabilos
Date: 2012-09-07 18:49:30 +0200 (Fri, 07 Sep 2012)
New Revision: 18542
Added:
trunk/gforge_base/evolvisforge-5.1/
trunk/gforge_base/evolvisforge-5.1/src/db/20120903-no-unix-account-for-deleted-users.sql
trunk/gforge_base/evolvisforge-5.1/tests/docs/
trunk/gforge_base/evolvisforge-5.1/tests/func/config.php.evolvis
Removed:
trunk/gforge_base/evolvisforge-5.1/
trunk/gforge_base/evolvisforge-5.1/src/db/20120903-no-unix-account-for-deleted-users.sql
Modified:
trunk/gforge_base/evolvisforge-5.1/src/common/include/Stats.class.php
trunk/gforge_base/evolvisforge-5.1/src/common/include/User.class.php
trunk/gforge_base/evolvisforge-5.1/src/common/include/constants.php
trunk/gforge_base/evolvisforge-5.1/src/common/mail/MailingList.class.php
trunk/gforge_base/evolvisforge-5.1/src/cronjobs/mail/mailing_lists_create.php
trunk/gforge_base/evolvisforge-5.1/src/cronjobs/mail/privatize_list.py
trunk/gforge_base/evolvisforge-5.1/src/deb-specific/db-upgrade.pl
trunk/gforge_base/evolvisforge-5.1/src/debian/changelog
trunk/gforge_base/evolvisforge-5.1/src/www/include/user_home.php
trunk/gforge_base/evolvisforge-5.1/src/www/mail/admin/index.php
trunk/gforge_base/evolvisforge-5.1/src/www/mail/index.php
trunk/gforge_base/evolvisforge-5.1/src/www/top/toplist.php
trunk/gforge_base/evolvisforge-5.1/tests/docs/HOWTO-set-up-test-VM.txt
trunk/gforge_base/evolvisforge-5.1/tests/func/Site/loginTest.php
trunk/gforge_base/evolvisforge-5.1/tests/func/db_reload.sh
Log:
merge upstream and evolvis SVN changes
pending merges:
nerville 2012-08-18 fix #457: Hide "permission denied" for non public mailing list, patch from F...
nerville 2012-08-16 fix status update if the mailing-list is not created yet
nerville 2012-08-10 fix general behavior creating mailing-list : sync with debian specific
mirabilos 2012-09-06 test documentation!
mirabilos 2012-09-06 First ever working FusionForge Selenium testcase on Evolvisforge!
mirabilos 2012-09-06 needs to be a valid PW, say people in IRC
mirabilos 2012-09-06 add a dynamic config for EvolvisForge on Debian
mirabilos 2012-09-06 only drop the database when you can restore it
Property changes on: trunk/gforge_base/evolvisforge-5.1
___________________________________________________________________
Added: bzr:pointless
+ 6
Added: svn:mergeinfo
+ /trunk/gforge_base/evolvisforge-5.1:7226,17132-17168,17573-17576,17584,17592,17595,17631,17646-17652,17877,17896,17962,18115,18537-18541
/branches/messer-51:17836,17838,17880-17882,17894-17895,18052,18260
/branches/papel-5.1:17947,17963,17988,18001,18022,18051,18101,18112
/branches/QA-2011Q4:evolvis-qs.lan.tarent.de:17861,17935-17936,17945,17956-17959,17960-17961,18015-18016,18019-18021,18023,18065,18098,18151
Added: svk:merge
+ 8ed69402-faa4-4b47-986e-66d49b2a90d8:/branches/QA-2011Q4:evolvis-qs.lan.tarent.de:17936
8ed69402-faa4-4b47-986e-66d49b2a90d8:/branches/QA-2011Q4:evolvis-qs.lan.tarent.de:17958
8ed69402-faa4-4b47-986e-66d49b2a90d8:/branches/QA-2011Q4:evolvis-qs.lan.tarent.de:17961
8ed69402-faa4-4b47-986e-66d49b2a90d8:/branches/QA-2011Q4:evolvis-qs.lan.tarent.de:18023
8ed69402-faa4-4b47-986e-66d49b2a90d8:/branches/QA-2011Q4:evolvis-qs.lan.tarent.de:18065
8ed69402-faa4-4b47-986e-66d49b2a90d8:/branches/QA-2011Q4:evolvis-qs.lan.tarent.de:18098
8ed69402-faa4-4b47-986e-66d49b2a90d8:/branches/QA-2011Q4:evolvis-qs.lan.tarent.de:18151
8ed69402-faa4-4b47-986e-66d49b2a90d8:/branches/messer-51:17838
8ed69402-faa4-4b47-986e-66d49b2a90d8:/branches/messer-51:17881
8ed69402-faa4-4b47-986e-66d49b2a90d8:/branches/messer-51:17895
8ed69402-faa4-4b47-986e-66d49b2a90d8:/branches/messer-51:18052
8ed69402-faa4-4b47-986e-66d49b2a90d8:/branches/messer-51:18260
8ed69402-faa4-4b47-986e-66d49b2a90d8:/branches/papel-5.1:17947
8ed69402-faa4-4b47-986e-66d49b2a90d8:/branches/papel-5.1:17988
8ed69402-faa4-4b47-986e-66d49b2a90d8:/branches/papel-5.1:18001
8ed69402-faa4-4b47-986e-66d49b2a90d8:/branches/papel-5.1:18022
8ed69402-faa4-4b47-986e-66d49b2a90d8:/branches/papel-5.1:18051
8ed69402-faa4-4b47-986e-66d49b2a90d8:/branches/papel-5.1:18112
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:17168
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:17584
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:17592
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:17595
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:17631
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:17652
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:17877
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:17896
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:17962
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:18115
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:18541
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:7226
Modified: trunk/gforge_base/evolvisforge-5.1/src/common/include/constants.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/include/constants.php 2012-09-05 14:05:42 UTC (rev 18536)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/include/constants.php 2012-09-07 16:49:30 UTC (rev 18542)
@@ -58,8 +58,9 @@
define('MAIL__MAILING_LIST_IS_REQUESTED', '1');
define('MAIL__MAILING_LIST_IS_CREATED', '2');
-define('MAIL__MAILING_LIST_IS_CONFIGURED', '3');
+define('MAIL__MAILING_LIST_IS_CONFIGURED', '3');
define('MAIL__MAILING_LIST_PW_RESET_REQUESTED', '4');
+define('MAIL__MAILING_LIST_IS_UPDATED', '5');
define('MAIL__MAILING_LIST_NAME_MIN_LENGTH', 4);
Modified: trunk/gforge_base/evolvisforge-5.1/src/common/mail/MailingList.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/mail/MailingList.class.php 2012-09-05 14:05:42 UTC (rev 18536)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/mail/MailingList.class.php 2012-09-07 16:49:30 UTC (rev 18542)
@@ -5,6 +5,7 @@
* Copyright 2002, Tim Perdue/GForge, LLC
* Copyright 2003, Guillaume Smet
* Copyright 2009, Roland Mas
+ * Copyright 2012, Franck Villaume - TrivialDev
*
* This file is part of FusionForge. FusionForge is free software;
* you can redistribute it and/or modify it under the terms of the
@@ -235,7 +236,8 @@
return false;
}
- if ($status == 'xyzzy') {
+ // do not update the status if the mailing-list is not created yet
+ if ($status == 'xyzzy' || $this->getStatus() == MAIL__MAILING_LIST_IS_REQUESTED) {
$status = $this->getStatus();
}
Modified: trunk/gforge_base/evolvisforge-5.1/src/cronjobs/mail/mailing_lists_create.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/cronjobs/mail/mailing_lists_create.php 2012-09-05 14:05:42 UTC (rev 18536)
+++ trunk/gforge_base/evolvisforge-5.1/src/cronjobs/mail/mailing_lists_create.php 2012-09-07 16:49:30 UTC (rev 18542)
@@ -37,7 +37,7 @@
$mlist = trim($mlist);
if ($mlist <> "") {
list($listname, $listdesc) = explode(" ",$mlist);
- $mailing_lists[] = strtolower($listname);
+ $mailing_lists[] = strtolower($listname);
}
}
@@ -97,20 +97,58 @@
passthru($lcreate_cmd, $failed);
if($failed) {
$err .= 'Failed to create '.$listname.", skipping\n";
-echo $err;
continue;
} else {
+ db_query_params('UPDATE mail_group_list set status=$1 WHERE status=$2 and group_list_id=$3',
+ array(MAIL__MAILING_LIST_IS_CREATED,
+ MAIL__MAILING_LIST_IS_REQUESTED,
+ $grouplistid));
+ echo db_error();
if ($is_commits_list || $public) {
// Make the *-commits list public
$err .= "Making ".$listname." public: ".$publicize_cmd."\n";
- passthru($publicize_cmd,$publicizeFailed);
+ passthru($publicize_cmd,$failed);
} else {
// Privatize the new list
$err .= "Privatizing ".$listname.": ".$privatize_cmd."\n";
- passthru($privatize_cmd,$privatizeFailed);
+ passthru($privatize_cmd,$failed);
}
+ $fixurl_cmd = escapeshellcmd(forge_get_config('mailman_path')."/bin/withlist -l -r fix_url $listname -u ".forge_get_config('lists_host'));
+ passthru($fixurl_cmd,$failed);
+ if (!$failed) {
+ db_query_params('UPDATE mail_group_list set status=$1 WHERE status=$2 and group_list_id=$3',
+ array(MAIL__MAILING_LIST_IS_CONFIGURED,
+ MAIL__MAILING_LIST_IS_CREATED,
+ $grouplistid));
+ echo db_error();
+ } else {
+ $err .= 'Failed to configure '.$listname."\n";
+ continue;
+ }
}
$mailingListIds[] = $grouplistid;
+ } elseif ($status == MAIL__MAILING_LIST_IS_CREATED) {
+ if ($is_commits_list || $public) {
+ // Make the *-commits list public
+ $err .= "Making ".$listname." public: ".$publicize_cmd."\n";
+ passthru($publicize_cmd,$failed);
+ } else {
+ // Privatize the new list
+ $err .= "Privatizing ".$listname.": ".$privatize_cmd."\n";
+ passthru($privatize_cmd,$failed);
+ }
+ $fixurl_cmd = escapeshellcmd(forge_get_config('mailman_path')."/bin/withlist -l -r fix_url $listname -u ".forge_get_config('lists_host'));
+ passthru($fixurl_cmd,$failed);
+ if (!failed) {
+ db_query_params('UPDATE mail_group_list set status=$1 WHERE status=$2 and group_list_id=$3',
+ array(MAIL__MAILING_LIST_IS_CONFIGURED,
+ MAIL__MAILING_LIST_IS_CREATED,
+ $grouplistid));
+ echo db_error();
+ } else {
+ $err .= 'Failed to configure '.$listname."\n";
+ continue;
+ }
} elseif ($status == MAIL__MAILING_LIST_IS_UPDATED) {
// For already created list, update only if status was changed on the forge to
// avoid anwanted reset of parameters.
@@ -118,18 +156,36 @@
// Get the mailman info on public/private to change
if ($is_commits_list || $public) {
$err .= "Making ".$listname." public: ".$publicize_cmd."\n";
- passthru($publicize_cmd,$publicizeFailed);
+ passthru($publicize_cmd, $failed);
} elseif (!$public) {
// Privatize only if it is marked as private
$err .= "Privatizing ".$listname.": ".$privatize_cmd."\n";
- passthru($privatize_cmd,$privatizeFailed);
+ passthru($privatize_cmd, $failed);
}
+ if ($failed) {
+ $err .= 'Failed to update '.$listname."\n";
+ } else {
+ db_query_params('UPDATE mail_group_list set status=$1 WHERE status=$2 and group_list_id=$3',
+ array(MAIL__MAILING_LIST_IS_CONFIGURED,
+ MAIL__MAILING_LIST_IS_UPDATED,
+ $grouplistid));
+ echo db_error();
+ }
} elseif ($status == MAIL__MAILING_LIST_PW_RESET_REQUESTED) {
$change_pw_cmd = escapeshellcmd(forge_get_config ('mailman_path').'/bin/change_pw -l '.$listname);
$err .= "Resetting password of ".$listname."\n";
- passthru($change_pw_cmd,$failed);
+ exec($change_pw_cmd, $returnnewpasswd, $failed);
if ($failed) {
$err .= 'Failed to reset password of '.$listname."\n";
+ } else {
+ $arrayReturnNewPasswd = explode(' ', $returnnewpasswd[0]);
+ $newpasswd = trim(end($arrayReturnNewPasswd));
+ db_query_params('UPDATE mail_group_list set (status, password) = ($1, $2) WHERE status=$3 and group_list_id=$4',
+ array(MAIL__MAILING_LIST_IS_CONFIGURED,
+ $newpasswd,
+ MAIL__MAILING_LIST_PW_RESET_REQUESTED,
+ $grouplistid));
+ echo db_error();
}
} else { // Old list
if (!$public) {
@@ -164,12 +220,6 @@
fwrite($h1,$list_str);
}
-
-db_query_params ('UPDATE mail_group_list set status=$1 WHERE status=$2',
- array (MAIL__MAILING_LIST_IS_CREATED,
- MAIL__MAILING_LIST_IS_REQUESTED));
-echo db_error();
-
fclose($h1);
//
Modified: trunk/gforge_base/evolvisforge-5.1/src/cronjobs/mail/privatize_list.py
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/cronjobs/mail/privatize_list.py 2012-09-05 14:05:42 UTC (rev 18536)
+++ trunk/gforge_base/evolvisforge-5.1/src/cronjobs/mail/privatize_list.py 2012-09-07 16:49:30 UTC (rev 18542)
@@ -5,5 +5,7 @@
mlist.member_posting_only=1
mlist.private_roster=1
mlist.archive_private=1
+mlist.forward_auto_discards=0
+mlist.generic_nonmember_action=2
mlist.Save()
Added: trunk/gforge_base/evolvisforge-5.1/src/db/20120903-no-unix-account-for-deleted-users.sql
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/db/20120903-no-unix-account-for-deleted-users.sql (rev 0)
+++ trunk/gforge_base/evolvisforge-5.1/src/db/20120903-no-unix-account-for-deleted-users.sql 2012-09-07 16:49:30 UTC (rev 18542)
@@ -0,0 +1 @@
+UPDATE users SET unix_status='D' WHERE status!='A';
Modified: trunk/gforge_base/evolvisforge-5.1/src/deb-specific/db-upgrade.pl
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/deb-specific/db-upgrade.pl 2012-09-05 14:05:42 UTC (rev 18536)
+++ trunk/gforge_base/evolvisforge-5.1/src/deb-specific/db-upgrade.pl 2012-09-07 16:49:30 UTC (rev 18542)
@@ -2511,7 +2511,7 @@
&update_with_sql("20120412-nuke-md5", "5.1-12+ev4");
&update_with_sql("20120622-tracker-vote-table", "5.1-12+ev5");
&update_with_sql("20120803-indices-for-rbac-tables", "5.1-12+ev6");
- &update_with_sql("20120903-no-unix-account-for-deleted-users", "5.1-12+ev7");
+ &update_with_sql("20120903-no-unix-account-for-deleted-users", "5.1-13");
########################### INSERT HERE #################################
Modified: trunk/gforge_base/evolvisforge-5.1/src/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/debian/changelog 2012-09-05 14:05:42 UTC (rev 18536)
+++ trunk/gforge_base/evolvisforge-5.1/src/debian/changelog 2012-09-07 16:49:30 UTC (rev 18542)
@@ -220,11 +220,16 @@
fusionforge (5.1.1-9) UNRELEASED; urgency=low
+ [ Roland Mas ]
* Reinstate code running the Mediawiki SQL initialisation code from the
package's postinst.
- -- Roland Mas <lolando at debian.org> Fri, 01 Jun 2012 11:04:11 +0200
+ [ Thorsten Glaser ]
+ * SECURITY: Upon user deletion, remove their Unix account as well
+ * SECURITY: Do not disclose inaccessible groups on user_home/toplist
+ -- Thorsten Glaser <tg at mirbsd.de> Mon, 03 Sep 2012 14:07:16 +0200
+
fusionforge (5.1.1-8) unstable; urgency=low
* Fixes from the 5.1 upstream branch.
Modified: trunk/gforge_base/evolvisforge-5.1/src/www/mail/admin/index.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/mail/admin/index.php 2012-09-05 14:05:42 UTC (rev 18536)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/mail/admin/index.php 2012-09-07 16:49:30 UTC (rev 18542)
@@ -6,6 +6,7 @@
* Copyright 2003-2004 (c) Guillaume Smet - Open Wide
* Copyright 2010 (c) Franck Villaume - Capgemini
* Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
+ * Copyright 2012, Franck Villaume - TrivialDev
* http://fusionforge.org/
*
* This file is part of FusionForge. FusionForge is free software;
@@ -95,7 +96,8 @@
if(!$mailingList->update(
unInputSpecialChars(getStringFromPost('description')),
- getIntFromPost('is_public', MAIL__MAILING_LIST_IS_PUBLIC)
+ getIntFromPost('is_public', MAIL__MAILING_LIST_IS_PUBLIC),
+ MAIL__MAILING_LIST_IS_UPDATED
)) {
exit_error($mailingList->getErrorMessage(),'mail');
} else {
@@ -283,7 +285,11 @@
echo '<tr '. $HTML->boxGetAltRowStyle($i) . '><td width="45%">'.
'<strong>'.$currentList->getName().'</strong><br />'.
htmlspecialchars($currentList->getDescription()).'</td>'.
- '<td style="text-align:center"><a href="'.getStringFromServer('PHP_SELF').'?group_id='.$group_id.'&group_list_id='.$currentList->getID().'&change_status=1">'._('Update').'</a></td>' ;
+ '<td style="text-align:center">';
+ if ($currentList->getStatus() != MAIL__MAILING_LIST_PW_RESET_REQUESTED) {
+ echo '<a href="'.getStringFromServer('PHP_SELF').'?group_id='.$group_id.'&group_list_id='.$currentList->getID().'&change_status=1">'._('Update').'</a>';
+ }
+ echo '</td>';
echo '<td style="text-align:center">';
if($currentList->getStatus() == MAIL__MAILING_LIST_IS_REQUESTED) {
echo _('Not activated yet');
Modified: trunk/gforge_base/evolvisforge-5.1/src/www/mail/index.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/mail/index.php 2012-09-05 14:05:42 UTC (rev 18536)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/mail/index.php 2012-09-07 16:49:30 UTC (rev 18542)
@@ -8,6 +8,7 @@
* Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
* Copyright © 2012
* Thorsten Glaser <t.glaser at tarent.de>
+ * Copyright 2012, Jean-Christophe Masson - French National Education Department
*
* This file is part of FusionForge. FusionForge is free software;
* you can redistribute it and/or modify it under the terms of the
@@ -90,10 +91,6 @@
for ($j = 0; $j < $mlCount; $j++) {
$currentList =& $mlArray[$j];
- if ($currentList->isError() &&
- $currentList->isPermissionDeniedError()) {
- continue;
- }
if ($currentList->isError()) {
if ($currentList->isPermissionDeniedError()) {
/* skip silently */
Modified: trunk/gforge_base/evolvisforge-5.1/tests/func/Site/loginTest.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/tests/func/Site/loginTest.php 2012-09-05 14:05:42 UTC (rev 18536)
+++ trunk/gforge_base/evolvisforge-5.1/tests/func/Site/loginTest.php 2012-09-07 16:49:30 UTC (rev 18542)
@@ -69,7 +69,7 @@
$this->type("form_pw", FORGE_ADMIN_PASSWORD);
$this->click("login");
$this->waitForPageToLoad("30000");
- $this->assertTrue($this->isTextPresent("Forge Admin"));
+ $this->assertTrue($this->isTextPresent("Site Admin"));
$this->assertTrue($this->isTextPresent("Log Out"));
$this->logout();
// Verify that logout is succesfull
@@ -84,7 +84,7 @@
$this->click("login");
$this->waitForPageToLoad("30000");
$this->assertTrue($this->isTextPresent("Missing Password Or Users Name"));
- $this->assertFalse($this->isTextPresent("Forge Admin"));
+ $this->assertFalse($this->isTextPresent("Site Admin"));
$this->assertTrue($this->isTextPresent("Log In"));
// Test with a wrong password.
@@ -96,12 +96,12 @@
$this->click("login");
$this->waitForPageToLoad("30000");
$this->assertTrue($this->isTextPresent("Invalid Password Or User Name"));
- $this->assertFalse($this->isTextPresent("Forge Admin"));
+ $this->assertFalse($this->isTextPresent("Site Admin"));
$this->assertTrue($this->isTextPresent("Log In"));
// Test factored code.
$this->login(FORGE_ADMIN_USERNAME);
- $this->assertTrue($this->isTextPresent("Forge Admin"));
+ $this->assertTrue($this->isTextPresent("Site Admin"));
$this->assertTrue($this->isTextPresent("Log Out"));
$this->clickAndWait("link=Site Admin");
@@ -120,7 +120,7 @@
$this->type("form_pw", FORGE_OTHER_PASSWORD);
$this->click("login");
$this->waitForPageToLoad("30000");
- $this->assertTrue($this->isTextPresent("Forge Admin"));
+ $this->assertTrue($this->isTextPresent("Site Admin"));
$this->assertTrue($this->isTextPresent("Log Out"));
$this->assertTrue($this->isTextPresent("Log Out"));
}
Copied: trunk/gforge_base/evolvisforge-5.1/tests/func/config.php.evolvis (from rev 18541, trunk/gforge_base/evolvisforge-5.1/tests/func/config.php.evolvis)
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/tests/func/config.php.evolvis (rev 0)
+++ trunk/gforge_base/evolvisforge-5.1/tests/func/config.php.evolvis 2012-09-07 16:49:30 UTC (rev 18542)
@@ -0,0 +1,48 @@
+<?php
+/*
+ * DANGER DANGER DANGER DANGER DANGER DANGER DANGER DANGER DANGER
+ * DANGER DANGER DANGER DANGER DANGER DANGER DANGER DANGER DANGER
+ *
+ * Running the test suite will drop your current database, this is
+ * to be used only on test environment.
+ *
+ * DANGER DANGER DANGER DANGER DANGER DANGER DANGER DANGER DANGER
+ * DANGER DANGER DANGER DANGER DANGER DANGER DANGER DANGER DANGER
+ */
+
+// Host where selenium-rc is running
+define ('SELENIUM_RC_HOST', 'localhost');
+define ('SELENIUM_RC_DIR', dirname(__FILE__) . '../../3rd-party/selenium');
+
+// The forge's hostname
+define ('HOST', trim(`hostname -f`));
+
+// Base URL where FusionForge is installed
+define ('ROOT', '');
+
+// Database connection parameters.
+define('DB_NAME', 'fforge');
+define('DB_USER', 'gforge');
+define('DB_PASSWORD', '@@FFDB_PASS@@');
+define('DB_INIT_CMD', dirname(__FILE__) . '/db_reload.sh');
+
+// this should be an existing user of the forge together with its password
+define ('FORGE_ADMIN_USERNAME', 'admin');
+define ('FORGE_ADMIN_PASSWORD', getenv('FORGE_ADMIN_PASSWORD'));
+define ('FORGE_OTHER_PASSWORD', 'myotherpass');
+
+// Enter true when file is configured.
+define('CONFIGURED', false);
+
+//
+// DON'T MODIFY BELOW THIS LINE UNLESS YOU KNOW WHAT YOU DO
+//
+
+// These are deduced from the previous definitions.
+
+// URL to access the application
+define ('URL', 'http://'.HOST.'/');
+
+// WSDL of the forges SOAP API
+define ('WSDL_URL', URL.'soap/index.php?wsdl');
+?>
Modified: trunk/gforge_base/evolvisforge-5.1/tests/func/db_reload.sh
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/tests/func/db_reload.sh 2012-09-05 14:05:42 UTC (rev 18536)
+++ trunk/gforge_base/evolvisforge-5.1/tests/func/db_reload.sh 2012-09-07 16:49:30 UTC (rev 18542)
@@ -1,4 +1,10 @@
#! /bin/sh
+
+test -f /root/dump || {
+ echo "Couldn't restore the database: No /root/dump found"
+ exit 2
+}
+
if [ $# -eq 1 ]
then
database=$1
@@ -30,18 +36,11 @@
service postgresql restart
fi
-echo "Droping database $database"
+echo "Dropping database $database"
su - postgres -c "dropdb -e $database"
-if [ -f /root/dump ]
-then
- echo "Restore database from dump file: psql -f- < /root/dump"
- su - postgres -c "psql -f-" < /root/dump > /var/log/pg_restore.log 2>/var/log/pg_restore.err
-else
- # TODO: reinit the db from scratch and create the dump
- echo "Couldn't restore the database: No /root/dump found"
- exit 2
-fi
+echo "Restore database from dump file: psql -f- < /root/dump"
+su - postgres -c "psql -f-" < /root/dump > /var/log/pg_restore.log 2>/var/log/pg_restore.err
echo "Starting apache"
if type invoke-rc.d 2>/dev/null
More information about the evolvis-commits
mailing list