From 33315ba67aaa322178936870feb3db3789a281bf Mon Sep 17 00:00:00 2001 From: "jrayhawk+piny.be@omgwallhack.org" Date: Wed, 27 Apr 2011 19:54:34 -0700 Subject: Renaming piny.newuseremail to piny.adminemail --- libpiny/lib/Piny/Config.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libpiny/lib') diff --git a/libpiny/lib/Piny/Config.pm b/libpiny/lib/Piny/Config.pm index a715024..ef18541 100644 --- a/libpiny/lib/Piny/Config.pm +++ b/libpiny/lib/Piny/Config.pm @@ -209,7 +209,7 @@ sub tweakable { # The tweakables # Global tweakables, which only make sense in the global config file. -tweakable "piny_newuseremail" => "jrayhawk\@omgwallhack.org", 'Str'; +tweakable "piny_adminemail" => "jrayhawk\@omgwallhack.org", 'Str'; # Repo-specific tweakables, in the repos' .git/config files. tweakable "piny_ikiwikidestdir" => "/srv/www/piny.be/", 'PathDir'; -- cgit v1.2.3 From e8a45817104834f42bdf039c4466569f23f675d1 Mon Sep 17 00:00:00 2001 From: Joe Rayhawk Date: Mon, 2 May 2011 21:09:11 -0700 Subject: Yeah, we probably shouldn't randomly truncate packed-refs. --- libpiny/lib/Piny/Repo.pm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'libpiny/lib') diff --git a/libpiny/lib/Piny/Repo.pm b/libpiny/lib/Piny/Repo.pm index be363bd..b81f9bf 100644 --- a/libpiny/lib/Piny/Repo.pm +++ b/libpiny/lib/Piny/Repo.pm @@ -225,8 +225,10 @@ sub rebuild { my $ikiuser = Piny::User::IkiWiki->new( "name" => "iki-" . $s->shortname ); foreach( "git-daemon-export-ok", "packed-refs" ) { - open( TOUCH, ">", $s->path . "/" . $_ ) or die "Could not touch $_ for repo: $!"; - close( TOUCH ); + unless( -e $s->path . "/" . $_ ) { + open( TOUCH, ">", $s->path . "/" . $_ ) or die "Could not touch $_ for repo: $!"; + close( TOUCH ); + }; }; foreach( "info", "logs", "branches" ) { @@ -393,8 +395,10 @@ sub create { system( "/usr/bin/git", "init", "--template=/srv/git-template.git", "--quiet", "--shared" ) and die "Could not initialize git repo!"; foreach( "git-daemon-export-ok", "packed-refs" ) { - open( TOUCH, ">", $repo->path . "/" . $_ ) or die "Could not touch $_ for repo: $!"; - close( TOUCH ); + unless( -e $s->path . "/" . $_ ) { + open( TOUCH, ">", $repo->path . "/" . $_ ) or die "Could not touch $_ for repo: $!"; + close( TOUCH ); + }; }; foreach( "info", "logs" ) { -- cgit v1.2.3 From e3e99770ed9a3b00b383fbcb4eaf009f0e22ac8c Mon Sep 17 00:00:00 2001 From: Joe Rayhawk Date: Mon, 2 May 2011 21:14:49 -0700 Subject: Fix syntax error with previous commit. --- libpiny/lib/Piny/Repo.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libpiny/lib') diff --git a/libpiny/lib/Piny/Repo.pm b/libpiny/lib/Piny/Repo.pm index b81f9bf..cfe7b1d 100644 --- a/libpiny/lib/Piny/Repo.pm +++ b/libpiny/lib/Piny/Repo.pm @@ -395,7 +395,7 @@ sub create { system( "/usr/bin/git", "init", "--template=/srv/git-template.git", "--quiet", "--shared" ) and die "Could not initialize git repo!"; foreach( "git-daemon-export-ok", "packed-refs" ) { - unless( -e $s->path . "/" . $_ ) { + unless( -e $repo->path . "/" . $_ ) { open( TOUCH, ">", $repo->path . "/" . $_ ) or die "Could not touch $_ for repo: $!"; close( TOUCH ); }; -- cgit v1.2.3