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.1 has been updated
via 4ff2270ea4f29daa5550a38a0d91ad4fddfad6d7 (commit)
via 3dc586bf7be9e2bf2102fc145945e492088ce64f (commit)
from 7073be5850a6b96e1be8d4be4011e922c5f1a48c (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=4ff2270ea4f29daa5550a38a0d91ad4fddfad6d7
commit 4ff2270ea4f29daa5550a38a0d91ad4fddfad6d7
Author: Franck Villaume <[email protected]>
Date: Sun Dec 24 13:31:45 2017 +0100
fix tracker autoassign upgrade script. extra_field_id 100 is reserved
diff --git a/src/db/20160627-tracker-autoassign.sql
b/src/db/20160627-tracker-autoassign.sql
index ae59ce0..7f19579 100644
--- a/src/db/20160627-tracker-autoassign.sql
+++ b/src/db/20160627-tracker-autoassign.sql
@@ -1,3 +1,6 @@
+-- extra_field_id 100 is reserved!
+UPDATE artifact_extra_field_list set extra_field_id = (select
max(extra_field_id)+1 from artifact_extra_field_list) where extra_field_id =
100;
+
INSERT INTO artifact_extra_field_list(extra_field_id, group_artifact_id,
field_name, alias, description) VALUES (100, 100, 'Default', 'default',
'Default Data - Dont Edit');
ALTER TABLE artifact_group_list
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=3dc586bf7be9e2bf2102fc145945e492088ce64f
commit 3dc586bf7be9e2bf2102fc145945e492088ce64f
Author: Franck Villaume <[email protected]>
Date: Fri Dec 22 20:36:36 2017 +0100
clean-up
diff --git a/src/cronjobs/misc/backup_site.php
b/src/cronjobs/misc/backup_site.php
index 73a110f..08898c0 100755
--- a/src/cronjobs/misc/backup_site.php
+++ b/src/cronjobs/misc/backup_site.php
@@ -23,30 +23,28 @@ require dirname(__FILE__).'/../www/env.inc.php';
require_once $gfcommon.'include/pre.php';
require $gfcommon.'include/cron_utils.php';
-$database=forge_get_config('database_name');
-$username=forge_get_config('database_user');
-$password=forge_get_config('database_password');
-$host=forge_get_config('database_host');
-$port=forge_get_config('database_port');
+$database = forge_get_config('database_name');
+$username = forge_get_config('database_user');
+$password = forge_get_config('database_password');
+$host = forge_get_config('database_host');
+$port = forge_get_config('database_port');
$num_of_days = forge_get_config('backup_days'); // Number of days to keep if
set, unlimited if not set
-$datetime=date('Y-m-d'); //we will use this to concatenate it with the tar
filename
+$datetime = date('Y-m-d'); //we will use this to concatenate it with the tar
filename
-if(!(isset($sys_path_to_backup)) || (strcmp($sys_path_to_backup,"/") == 0)){
-// cron_entry(23,'Variable $sys_path_to_backup was not set or it was equal
to /.');
-// exit;
+if (!(isset($sys_path_to_backup)) || (strcmp($sys_path_to_backup,"/") == 0)) {
// Default value
- $sys_path_to_backup = '/gforge-backups/';
+ $sys_path_to_backup = '/fusionforge-backups/';
}
-if(util_is_root_dir($sys_path_to_backup)){
- $sys_path_to_backup=$sys_path_to_backup.'/';
+if (util_is_root_dir($sys_path_to_backup)) {
+ $sys_path_to_backup = $sys_path_to_backup.'/';
}
if (!is_dir($sys_path_to_backup)) {
if (!mkdir($sys_path_to_backup, 0700, true)) {
- cron_entry(23,'Couldn\'t create directory
'.$sys_path_to_backup.' for backups');
+ cron_entry(23, 'Could not create directory
'.$sys_path_to_backup.' for backups');
exit;
}
}
@@ -56,27 +54,24 @@ if (!preg_match('/\\/$/',$sys_path_to_backup)) {
$sys_path_to_backup .= '/';
}
-function delete_files( $files )
-{
+function delete_files($files) {
global $err;
- $output="";
+ $output = '';
@exec('rm -rf '.$files.' 2>&1', $output, $retval);
- if($retval!=0){
+ if ($retval!=0) {
$err .= implode("\n", $output);
}
}
-$output = "";
-$err = "";
+$output = '';
+$err = '';
-if ($num_of_days)
-{
+if ($num_of_days) {
/* Delete all old backups with in 30 days old */
- for( $day = $num_of_days; $day <= $num_of_days + 30; $day = $day + 1)
- {
+ for ($day = $num_of_days; $day <= $num_of_days + 30; $day = $day + 1) {
// day to be deleted
- $trash = date('Y-m-d', mktime(0,0,0, date("m"), date("d")-$day,
date("Y")));
+ $trash = date('Y-m-d', mktime(0,0,0, date('m'), date('d')-$day,
date('Y')));
// delete old backups
delete_files($sys_path_to_backup.'/backup'.$trash.'.tar.bz2');
@@ -94,12 +89,12 @@ if ($port) {
$dump_cmd .= ' -p ' . $port;
}
-$tmpfname = tempnam(sys_get_temp_dir(), "tmp");
+$tmpfname = tempnam(sys_get_temp_dir(), 'tmp');
-$handle = fopen($tmpfname, "w");
+$handle = fopen($tmpfname, 'w');
$line = '';
-$line .= $host ? "$host:" : "localhost:";
-$line .= $port ? "$port:" : "5432:";
+$line .= $host ? "$host:" : 'localhost:';
+$line .= $port ? "$port:" : '5432:';
$line .= "$database:$username:$password";
fwrite($handle, "$line");
fclose($handle);
@@ -118,11 +113,11 @@ if($retval!=0){
$output="";
if (file_exists(forge_get_config('upload_dir'))) {
@exec('tar -hjcvf
'.$sys_path_to_backup.'uploads-tmp-'.$datetime.'.tar.bz2
'.forge_get_config('upload_dir').' 2>&1' ,$output,$retval); //proceed upload
dir tar file creation
- if($retval!=0){
+ if($retval!=0) {
$err.= implode("\n", $output);
}
} else {
- $err.= 'Unable to find upload dir. Configured value
is:'.forge_get_config('upload_dir');
+ $err.= _('Unable to find upload dir. Configured value is')._(':
').forge_get_config('upload_dir');
}
/**************************************
@@ -133,11 +128,11 @@ $output="";
$mailman_data_dir = '/var/lib/mailman';
if (file_exists($mailman_data_dir)) {
@exec('tar -hjcvf
'.$sys_path_to_backup.'mailinglist-tmp-'.$datetime.'.tar.bz2
'.$mailman_data_dir.'/ 2>&1', $output,$retval); //proceed mailman dir tar
file creation
- if($retval!=0){
+ if ($retval != 0) {
$err.= implode("\n", $output);
}
} else {
- $err.= 'Unable to find Mailman data dir. Please edit backup_site.php
cronjob';
+ $err.= _('Unable to find Mailman data dir. Please edit backup_site.php
cronjob');
}
/**************************************
@@ -146,11 +141,11 @@ if (file_exists($mailman_data_dir)) {
$output="";
if (file_exists(forge_get_config('repos_path', 'scmcvs'))) {
@exec('tar -hjcvf
'.$sys_path_to_backup.'cvsroot-tmp-'.$datetime.'.tar.bz2
'.forge_get_config('repos_path', 'scmcvs').'/ 2>&1' ,$output,$retval);
//proceed cvsroot dir tar file creation
- if($retval!=0){
- $err.= implode("\n", $output);
+ if ($retval != 0) {
+ $err .= implode("\n", $output);
}
} else {
- $err.= 'Unable to find CVSROOT dir. Configured value
is:'.forge_get_config('repos_path', 'scmcvs');
+ $err.= _('Unable to find CVSROOT dir. Configured value is')._(':
').forge_get_config('repos_path', 'scmcvs');
}
/**************************************
@@ -160,13 +155,13 @@ $svndir_prefix = forge_get_config ('repos_path',
'scmsvn');
if (file_exists($svndir_prefix)) {
$hot_backup = dirname(__FILE__).'/hot-backup.py';
$svn_path = dirname(`which svn`);
- $output="";
+ $output = '';
if (!file_exists($hot_backup) || !$svn_path) {
// hot-backup.py script not available, try regular backup
(doesn't check for inconsistencies)
@exec('tar -hjcvf
'.$sys_path_to_backup.'svnroot-tmp-'.$datetime.'.tar.bz2 '.$svndir_prefix.'/
2>&1' ,$output,$retval); //proceed svnroot dir tar file creation
- if($retval!=0){
- $err.= implode("\n", $output);
+ if ($retval != 0) {
+ $err .= implode("\n", $output);
}
} else {
// backup the files using hot-backup script
@@ -179,31 +174,31 @@ if (file_exists($svndir_prefix)) {
if (!is_dir($path)) continue; // not a
repository
$cmd = 'SVN_PATH="'.$svn_path.'" '.$hot_backup.'
'.$path.' '.$repos_backup_dir;
@exec($cmd, $output, $retval);
- if($retval!=0){
+ if ($retval != 0) {
$err.= implode("\n", $output);
}
}
@exec('tar -hjcvf
'.$sys_path_to_backup.'svnroot-tmp-'.$datetime.'.tar.bz2 '.$repos_backup_dir.'
2>&1' ,$output,$retval);
- if($retval!=0){
- $err.= implode("\n", $output);
+ if ($retval != 0) {
+ $err .= implode("\n", $output);
}
- @exec("rm -rf ".$repos_backup_dir);
+ @exec('rm -rf '.$repos_backup_dir);
}
} else {
- $err.= 'Unable to find SVNROOT dir. Configured value
is:'.$svndir_prefix;
+ $err.= _('Unable to find SVNROOT dir. Configured value is')._(':
').$svndir_prefix;
}
/**************************************
* Backup config files
**************************************/
-$output="";
+$output='';
if (file_exists(forge_get_config('config_path'))) {
@exec('tar -jcvf '.$sys_path_to_backup.'etc-tmp-'.$datetime.'.tar.bz2
'.forge_get_config('config_path').' 2>&1' ,$output,$retval); //proceed
svnroot dir tar file creation
- if($retval!=0){
- $err.= implode("\n", $output);
+ if ($retval != 0) {
+ $err .= implode("\n", $output);
}
} else {
$err.= 'Unable to find '.forge_get_config('config_path').' dir.';
@@ -213,19 +208,19 @@ if (file_exists(forge_get_config('config_path'))) {
/**************************************
* Create backup file
**************************************/
-$output="";
+$output = '';
@exec('tar -jcvf '.$sys_path_to_backup.'backup'.$datetime.'.tar.bz2
'.$sys_path_to_backup.'*-tmp-'.$datetime.'* 2>&1',$output,$retval);
-if($retval!=0){
- $err.= implode("\n", $output);
+if ($retval != 0) {
+ $err .= implode("\n", $output);
}
//If execution of tar command was successful ($retval equals zero) remove
individual files
-if($retval==0){
- $output="";
+if ($retval == 0) {
+ $output = '';
@exec('rm '.$sys_path_to_backup.'*tmp-'.$datetime.'*
2>&1',$output,$retval);
- if($retval!=0){
- $err.= implode("\n", $output);
+ if ($retval != 0) {
+ $err .= implode("\n", $output);
}
}
-cron_entry(23,$err);
+cron_entry(23, $err);
-----------------------------------------------------------------------
Summary of changes:
src/cronjobs/misc/backup_site.php | 103 ++++++++++++++++-----------------
src/db/20160627-tracker-autoassign.sql | 3 +
2 files changed, 52 insertions(+), 54 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
