[evolvis-commits] r17980: [#1836] default-website-for-projects pending merges:↵ Thorsten Glaser 2012-01-10 what’s the use of a default page if it never gets installed?↵ Thorsten Glaser 2012-01-10 merge most of 4.8’s group_dump_update.pl
mirabilos at evolvis.org
mirabilos at evolvis.org
Tue Jan 10 15:11:51 CET 2012
Author: mirabilos
Date: 2012-01-10 15:11:51 +0100 (Tue, 10 Jan 2012)
New Revision: 17980
Modified:
trunk/gforge_base/evolvisforge-5.1/src/deb-specific/group_dump_update.pl
trunk/gforge_base/evolvisforge-5.1/src/debian/changelog
trunk/gforge_base/evolvisforge-5.1/src/packaging/install/common
Log:
[#1836] default-website-for-projects pending merges:
Thorsten Glaser 2012-01-10 what’s the use of a default page if it never gets installed?
Thorsten Glaser 2012-01-10 merge most of 4.8’s group_dump_update.pl
Modified: trunk/gforge_base/evolvisforge-5.1/src/deb-specific/group_dump_update.pl
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/deb-specific/group_dump_update.pl 2012-01-09 12:39:49 UTC (rev 17979)
+++ trunk/gforge_base/evolvisforge-5.1/src/deb-specific/group_dump_update.pl 2012-01-10 14:11:51 UTC (rev 17980)
@@ -106,7 +106,11 @@
$default_perms = 2770 ;
$file_default_perms = 660;
$default_page = "/usr/share/gforge/lib/private_default_page.php" ;
+ if (! -e $default_page) {
+ $default_page = "/usr/share/gforge/lib/default_page.php";
+ }
}
+ $incdir_perms = 2775;
if ($verbose) {print("Making a Group for : $gname\n")};
@@ -121,8 +125,8 @@
system("chmod $default_perms $log_dir");
system("chmod $default_perms $cgi_dir");
system("chmod $default_perms $ht_dir");
- system("chmod $default_perms $inc_dir");
- system("chmod $file_default_perms $ht_dir/index.php");
+ system("chmod $incdir_perms $inc_dir");
+ system("chmod 664 $ht_dir/index.php");
chown $dummy_uid, $gid, ($group_dir, $log_dir, $cgi_dir, $ht_dir);
chown $dummy_uid, $gid, ("$ht_dir/index.php");
}
@@ -147,6 +151,7 @@
} else {
$default_perms = 2771 ;
}
+ $incdir_perms = 2775;
if ($verbose) {print("Updating Group: $gname\n")};
@@ -154,7 +159,7 @@
system("chmod $default_perms $log_dir");
system("chmod $default_perms $cgi_dir");
system("chmod $default_perms $ht_dir");
- system("chmod $default_perms $inc_dir");
+ system("chmod $incdir_perms $inc_dir");
chown $dummy_uid, $gid, ($group_dir, $log_dir, $cgi_dir, $ht_dir, $inc_dir);
my $realuid=get_file_owner_uid($group_dir);
Modified: trunk/gforge_base/evolvisforge-5.1/src/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/debian/changelog 2012-01-09 12:39:49 UTC (rev 17979)
+++ trunk/gforge_base/evolvisforge-5.1/src/debian/changelog 2012-01-10 14:11:51 UTC (rev 17980)
@@ -22,9 +22,10 @@
* [#2374] do not display /activity/ link in a !development environment
* [#2313] Tracker: put a trash can icon into the column heading
* Improve tooltip help for the write a comment field
- * [#2369] make tipsies easier to read
+ * [#2369] Make tipsies easier to read
+ * [#1836] Fix creation of group default webpage
- -- Thorsten Glaser <t.glaser at tarent.de> Mon, 09 Jan 2012 13:29:27 +0100
+ -- Thorsten Glaser <t.glaser at tarent.de> Tue, 10 Jan 2012 11:59:33 +0100
fusionforge (5.1.1+evolvis6) unstable; urgency=low
Modified: trunk/gforge_base/evolvisforge-5.1/src/packaging/install/common
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/packaging/install/common 2012-01-09 12:39:49 UTC (rev 17979)
+++ trunk/gforge_base/evolvisforge-5.1/src/packaging/install/common 2012-01-10 14:11:51 UTC (rev 17980)
@@ -19,7 +19,7 @@
#
deb-specific/user_dump_update.pl usr/share/@OLDPACKAGE@/bin/
deb-specific/group_dump_update.pl usr/share/@OLDPACKAGE@/bin/
-#cronjobs/cvs-cron/default_page.php usr/share/@OLDPACKAGE@/cronjobs/
+cronjobs/default_page.php usr/share/@OLDPACKAGE@/lib/
deb-specific/ssh_dump_update.pl usr/share/@OLDPACKAGE@/bin/
deb-specific/mailfwd_update.pl usr/share/@OLDPACKAGE@/bin/
#
More information about the evolvis-commits
mailing list