Merge branch 'master' of piny.be:/srv/git/piny-code

Conflicts:
	libpiny/lib/Piny/Repo.pm

3 files changed, 56 insertions, 7 deletions

diff --git a/libpiny/lib/Piny/Config.pm b/libpiny/lib/Piny/Config.pm
index 29a06d5..535df33 100644
--- a/libpiny/lib/Piny/Config.pm
+++ b/libpiny/lib/Piny/Config.pm
@@ -55,7 +55,7 @@ has 'confpath' =>
 
 has '_conf' =>
   ( is          => 'ro'
-  , isa         => 'HashRef[Maybe[Str]]'
+  , isa         => 'HashRef[Str]'
   , lazy_build  => 1
   , clearer     => 'clear_conf'
   , init_arg    => undef
@@ -107,6 +107,10 @@ sub _build__conf {
 
   };
 
+  foreach my $key ( keys %$conf ) {
+    $conf->{$key} = "" unless defined $conf->{$key};
+  };
+
   return $conf;
 };
 
@@ -204,6 +208,7 @@ sub tweakable {
 
 # The tweakables
 
+# Repo-specific tweakables, in the repos' .git/config files.
 tweakable "piny_ikiwikidestdir"         => "/srv/www/piny.be/", 'PathDir';
 tweakable "piny_ikiwikisrcdir"          => "/srv/ikiwiki/", 'PathDir';
 tweakable "piny_ikiwikiurl"             => "http://piny.be/", 'HttpUrl';
@@ -211,6 +216,9 @@ tweakable "piny_ikiwikisecureurl"       => "https://secure.piny.be/", 'HttpsUrl'
 tweakable "piny_ikiwikisecurepath"      => "/srv/www/secure.piny.be/", 'PathDir';
 tweakable "receive_denynonfastforwards" => "true", 'GitBool';
 
+# User-specific tweakables, in the users' ~/.gitconfig files.
+tweakable "user_email"                  => undef, 'Maybe[Str]';
+
 # Moose boilerplate
 
 __PACKAGE__->meta->make_immutable;
diff --git a/libpiny/lib/Piny/Repo.pm b/libpiny/lib/Piny/Repo.pm
index 306b3a8..335843e 100644
--- a/libpiny/lib/Piny/Repo.pm
+++ b/libpiny/lib/Piny/Repo.pm
@@ -203,12 +203,15 @@ sub has_access {
 sub rebuild {
   my ( $s ) = @_;
 
-  unless( getgrnam("git-" . $s->name ); ) {
-    system( "/usr/sbin/addgroup", "--quiet", "git-$s->name" ) and die "Could not create repo group!";
+  unless( getgrnam("git-" . $s->name ) ) {
+    system( "/usr/sbin/addgroup", "--quiet", "git-" . $s->name ) and die "Could not create repo group!";
+    system( "/usr/sbin/adduser", "--quiet", $s->owner->name, "git-" . $s->name ) and die "Could not add you to the repo group!";
+    system( "/usr/sbin/adduser", "--quiet", "iki-" . $s->name, "git-" . $s->name ) and print "...But that's probably okay.\n";
   };
 
-  unless( getpwname("iki-" . $s->name ); ) {
-	system( "/usr/sbin/adduser", "--quiet", "--system", "--group", "--gecos", $s->name, "iki-$s->name" ) and die "Could not create ikiwiki user!";
+  unless( getpwnam("iki-" . $s->name ) ) {
+    system( "/usr/sbin/adduser", "--quiet", "--system", "--group", "--gecos", $s->name, "iki-" . $s->name ) and die "Could not create ikiwiki user!";
+    system( "/usr/sbin/adduser", "--quiet", "iki-" . $s->name, "git-" . $s->name ) and die "Could not add ikiwiki user to the repo group!";
   };
 
   my $ikiuser = Piny::User::IkiWiki->new( "name" => "iki-" . $s->name );
@@ -234,7 +237,14 @@ sub rebuild {
   print SETUP $s->ikiwiki_setup;
   close( SETUP ) or die "Could not close new ikiwiki setup file: $!";
 
-  system( "/bin/chown", "-R", $ikiuser->name . "." . $ikiuser->name, $s->ikiwiki_srcdir, $s->ikiwiki_destdir, $s->secure_path ) and die "Could not change ownership of ikiwiki directories!";
+  unless( -d $s->ikiwiki_srcdir ) {
+    system( "/usr/bin/git", "clone", "--quiet", $s->path, $s->ikiwiki_srcdir ) and die "Could not clone repo to ikiwiki srcdir!"; 
+  };
+
+  foreach( $ikiuser->name, $s->ikiwiki_srcdir, $s->ikiwiki_destdir, $s->secure_path ) {
+    unless( -d $_ ) { mkdir( $_ ) };
+    system( "/bin/chown", "-R", $ikiuser->name . ".", $_ ) and die "Could not change ownership of ikiwiki directories!";
+  };
 
   open( WIKILIST, ">", "/etc/ikiwiki/wikilist.d/" . $s->name ) or die "Could not create wikilist.d file: $!";
   print WIKILIST $ikiuser->name . " /etc/ikiwiki/piny/" . $s->name . ".setup\n";
diff --git a/libpiny/lib/Piny/User.pm b/libpiny/lib/Piny/User.pm
index baae258..f742f87 100644
--- a/libpiny/lib/Piny/User.pm
+++ b/libpiny/lib/Piny/User.pm
@@ -10,6 +10,7 @@ use Moose;
 use Moose::Util::TypeConstraints;
 use MooseX::StrictConstructor;
 
+use Piny::Config;
 use Piny::Email;
 use Piny::Group;
 
@@ -49,6 +50,20 @@ has 'password_hash' =>
   , init_arg    => undef
   );
 
+has 'home' =>
+  ( is          => 'ro'
+  , isa         => 'Path'
+  , lazy_build  => 1
+  , init_arg    => undef
+  );
+
+has 'config' =>
+  ( is          => 'ro'
+  , isa         => 'Piny::Config'
+  , lazy_build  => 1
+  , init_arg    => undef
+  );
+
 has 'email' =>
   ( is          => 'ro'
   , isa         => 'Piny::Email'
@@ -180,10 +195,26 @@ sub _build_password_hash {
   return $s->pwent( )->[1];
 };
 
+sub _build_home {
+  my ( $s ) = @_;
+
+  return $s->pwent( )->[7];
+};
+
+sub _build_config {
+  my ( $s ) = @_;
+
+  return Piny::Config->new( confpath => $s->home . "/.gitconfig" );
+};
+
 sub _build_email {
   my ( $s ) = @_;
 
-  return Piny::Email->new( address => $s->pwent( )->[6] );
+  if ( not defined $s->config->user_email ) {
+    die "You must provide a user.email attribute in your .gitconfig!\nPlease run pinyconfig --user user.email your\@email.com";
+  };
+
+  return Piny::Email->new( address => $s->config->user_email );
 };
 
 sub _build_groups {