X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=script%2Fpublic-inbox-init;h=34c93b47882c3b52623a4de583197cc3c90f57cd;hb=55b707d788ce13696e4411389583e720ea6dab01;hp=54d6ce4c11743c7137352379bb6f83c83fa4f8cc;hpb=48b21cb662c1e17b7219612bff6ea14b98c85221;p=public-inbox.git diff --git a/script/public-inbox-init b/script/public-inbox-init index 54d6ce4c..34c93b47 100755 --- a/script/public-inbox-init +++ b/script/public-inbox-init @@ -1,22 +1,41 @@ #!/usr/bin/perl -w -# Copyright (C) 2014-2015 all contributors -# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt) +# Copyright (C) 2014-2019 all contributors +# License: AGPL-3.0+ # # Initializes a public-inbox, basically a wrapper for git-init(1) use strict; use warnings; -my $usage = "public-inbox-init NAME GIT_DIR HTTP_URL ADDRESS [ADDRESS..]"; +sub usage { + print STDERR < \$version, + 'L|indexlevel=s' => \$indexlevel, + 'S|skip|skip-epoch=i' => \$skip_epoch, +); +GetOptions(%opts) or usage(); +PublicInbox::Admin::indexlevel_ok_or_die($indexlevel) if defined $indexlevel; my $name = shift @ARGV or usage(); -my $git_dir = shift @ARGV or usage(); +my $inboxdir = shift @ARGV or usage(); my $http_url = shift @ARGV or usage(); my (@address) = @ARGV; @address or usage(); @@ -25,9 +44,35 @@ my %seen; my $pi_config = PublicInbox::Config->default_file; my $dir = dirname($pi_config); mkpath($dir); # will croak on fatal errors -my ($fh, $filename) = tempfile('pi-init-XXXXXXXX', DIR => $dir); + +# first, we grab a flock to prevent simultaneous public-inbox-init +# processes from trampling over each other, or exiting with 255 on +# O_EXCL failure below. This gets unlocked automatically on exit: +my $lock_obj = { lock_path => "$pi_config.flock" }; +PublicInbox::Lock::lock_acquire($lock_obj); + +# git-config will operate on this (and rename on success): +my ($fh, $pi_config_tmp) = tempfile('pi-init-XXXXXXXX', DIR => $dir); + +# Now, we grab another lock to use git-config(1) locking, so it won't +# wait on the lock, unlike some of our internal flock()-based locks. +# This is to prevent direct git-config(1) usage from clobbering our +# changes. +my $lockfile = "$pi_config.lock"; +my $lockfh; +sysopen($lockfh, $lockfile, O_RDWR|O_CREAT|O_EXCL) or do { + warn "could not open config file: $lockfile: $!\n"; + exit(255); +}; +my $auto_unlink = UnlinkMe->new($lockfile); +my $perm; if (-e $pi_config) { open(my $oh, '<', $pi_config) or die "unable to read $pi_config: $!\n"; + my @st = stat($oh); + $perm = $st[2]; + defined $perm or die "(f)stat failed on $pi_config: $!\n"; + chmod($perm & 07777, $fh) or + die "(f)chmod failed on future $pi_config: $!\n"; my $old; { local $/; @@ -56,19 +101,85 @@ if (-e $pi_config) { } exit(1) if $conflict; + + my $ibx = $cfg->lookup_name($name); + if ($ibx) { + if (!defined($indexlevel) && $ibx->{indexlevel}) { + $indexlevel = $ibx->{indexlevel}; + } + } } -close $fh or die "failed to close $filename: $!\n"; +close $fh or die "failed to close $pi_config_tmp: $!\n"; my $pfx = "publicinbox.$name"; -my @x = (qw/git config/, "--file=$filename"); -$git_dir = abs_path($git_dir); -x(qw(git init -q --bare), $git_dir); +my @x = (qw/git config/, "--file=$pi_config_tmp"); + +$inboxdir = abs_path($inboxdir); +if (-f "$inboxdir/inbox.lock") { + if (!defined $version) { + $version = 2; + } elsif ($version != 2) { + die "$inboxdir is a -V2 repo, -V$version specified\n" + } +} elsif (-d "$inboxdir/objects") { + if (!defined $version) { + $version = 1; + } elsif ($version != 1) { + die "$inboxdir is a -V1 repo, -V$version specified\n" + } +} + +$version = 1 unless defined $version; + +if ($version == 1 && defined $skip_epoch) { + die "--skip-epoch is only supported for -V2 repos\n"; +} + +my $ibx = PublicInbox::Inbox->new({ + inboxdir => $inboxdir, + name => $name, + version => $version, + -primary_address => $address[0], + indexlevel => $indexlevel, +}); + +my $creat_opt = {}; +PublicInbox::InboxWritable->new($ibx, $creat_opt)->init_inbox(0, $skip_epoch); + +# needed for git prior to v2.1.0 +umask(0077) if defined $perm; + foreach my $addr (@address) { next if $seen{lc($addr)}; x(@x, "--add", "$pfx.address", $addr); } x(@x, "$pfx.url", $http_url); -x(@x, "$pfx.mainrepo", $git_dir); +x(@x, "$pfx.inboxdir", $inboxdir); + +if (defined($indexlevel)) { + x(@x, "$pfx.indexlevel", $indexlevel); +} + +# needed for git prior to v2.1.0 +if (defined $perm) { + chmod($perm & 07777, $pi_config_tmp) or + die "(f)chmod failed on future $pi_config: $!\n"; +} + +rename $pi_config_tmp, $pi_config or + die "failed to rename `$pi_config_tmp' to `$pi_config': $!\n"; +$auto_unlink->DESTROY; + +package UnlinkMe; +use strict; -rename $filename, $pi_config or - die "failed to rename `$filename' to `$pi_config': $!\n"; +sub new { + my ($klass, $file) = @_; + bless { file => $file }, $klass; +} + +sub DESTROY { + my $f = delete($_[0]->{file}); + unlink($f) if defined($f); +} +1;