diff options
| author | Julian Blake Kongslie <jblake@omgwallhack.org> | 2011-05-13 15:15:29 -0700 |
|---|---|---|
| committer | Julian Blake Kongslie <jblake@omgwallhack.org> | 2011-05-13 15:15:29 -0700 |
| commit | d9df093f1837f971090def69fb20e5677cb364da (patch) | |
| tree | 115b6df9f9a03a79cfdd855003b3b7c0b0447e79 /libpiny | |
| parent | c4fb9497982e2f51c1afefd43f94be8c6cc74edc (diff) | |
| parent | 9a8be1d87c03fbcdbc7b62e1369cdfe3f5aba193 (diff) | |
| download | piny-code-d9df093f1837f971090def69fb20e5677cb364da.tar.gz piny-code-d9df093f1837f971090def69fb20e5677cb364da.zip | |
Merge branch 'master' of ssh://piny/srv/git/piny-code
Diffstat (limited to 'libpiny')
| -rw-r--r-- | libpiny/lib/Piny/Config.pm | 6 | ||||
| -rw-r--r-- | libpiny/lib/Piny/Repo.pm | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libpiny/lib/Piny/Config.pm b/libpiny/lib/Piny/Config.pm index acf63ff..4df09ba 100644 --- a/libpiny/lib/Piny/Config.pm +++ b/libpiny/lib/Piny/Config.pm @@ -49,8 +49,8 @@ subtype 'HttpsUrl' subtype 'RepoPermission' => as 'Str' - => where { $_ eq "666" or $_ eq "664" or $_ eq "660" or $_ eq "640" } - => message { 'Must be one of 666, 664, 660, or 640.' } + => where { $_ eq "0666" or $_ eq "0664" or $_ eq "0660" or $_ eq "0640" or $_ eq "group" or $_ eq "true" or $_ eq "all" or $_ eq "everybody" or $_ eq "world"} + => message { 'Must be one of 0666, 0664 (or all, everybody, world), 0660 (or true, group), or 0640.' } ; # Attributes @@ -263,7 +263,7 @@ tweakable "piny_ikiwikisrcdir" => "/srv/ikiwiki/", 'PathDir'; tweakable "piny_ikiwikiurl" => "http://piny.be/", 'HttpUrl'; tweakable "piny_ikiwikisecureurl" => "https://secure.piny.be/", 'HttpsUrl'; tweakable "piny_ikiwikisecurepath" => "/srv/www/secure.piny.be/", 'PathDir'; -tweakable "piny_permission" => '664', 'RepoPermission'; +tweakable "core_sharedrepository" => '0664', 'RepoPermission'; tweakable "receive_denynonfastforwards" => "true", 'GitBool'; # User-specific tweakables, in the users' ~/.gitconfig files. diff --git a/libpiny/lib/Piny/Repo.pm b/libpiny/lib/Piny/Repo.pm index f4dca6e..1f50957 100644 --- a/libpiny/lib/Piny/Repo.pm +++ b/libpiny/lib/Piny/Repo.pm @@ -355,8 +355,8 @@ sub destroy_ikiwiki { my $ikiuser = Piny::User::IkiWiki->new( "name" => "iki-" . $s->name ); - getpwnam( "iki-" . $s->shortname ) and system( "deluser", "--remove-home", "iki-" . $s->shortname ); - getgrnam( "iki-" . $s->shortname ) and system( "delgroup", "iki-" . $s->shortname ); + getpwnam( "iki-" . $s->shortname ) and system( "deluser", "--quiet", "--remove-home", "iki-" . $s->shortname ); + getgrnam( "iki-" . $s->shortname ) and system( "delgroup", "--quiet", "iki-" . $s->shortname ); }; |