config: support "inboxdir" in addition to "mainrepo"

[public-inbox.git] / script / public-inbox-init

diff --git a/script/public-inbox-init b/script/public-inbox-init
index 39f2a067a20e21446e7561fe5240c3280253f762..507112661ddc6a61619b7e30cfc2bbbca59cec71 100755 (executable)
--- a/script/public-inbox-init
+++ b/script/public-inbox-init
@@ -12,8 +12,10 @@ PublicInbox::Admin::require_or_die('-base');
 require PublicInbox::Config;
 require PublicInbox::InboxWritable;
 use File::Temp qw/tempfile/;
+use PublicInbox::Lock;
 use File::Basename qw/dirname/;
 use File::Path qw/mkpath/;
+use Fcntl qw(:DEFAULT);
 use Cwd qw/abs_path/;
 
 sub x { system(@_) and die join(' ', @_). " failed: $?\n" }
@@ -29,7 +31,7 @@ my %opts = (
 GetOptions(%opts) or usage();
 PublicInbox::Admin::indexlevel_ok_or_die($indexlevel) if defined $indexlevel;
 my $name = shift @ARGV or usage();
-my $mainrepo = shift @ARGV or usage();
+my $inboxdir = shift @ARGV or usage();
 my $http_url = shift @ARGV or usage();
 my (@address) = @ARGV;
 @address or usage();
@@ -38,7 +40,29 @@ my %seen;
 my $pi_config = PublicInbox::Config->default_file;
 my $dir = dirname($pi_config);
 mkpath($dir); # will croak on fatal errors
+
+# 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 {
+       $lockfh = undef;
+       warn "could not open config file: $lockfile: $!\n";
+       exit(255);
+};
+END { unlink($lockfile) if $lockfh };
+
 my $perm;
 if (-e $pi_config) {
        open(my $oh, '<', $pi_config) or die "unable to read $pi_config: $!\n";
@@ -88,18 +112,18 @@ close $fh or die "failed to close $pi_config_tmp: $!\n";
 my $pfx = "publicinbox.$name";
 my @x = (qw/git config/, "--file=$pi_config_tmp");
 
-$mainrepo = abs_path($mainrepo);
-if (-f "$mainrepo/inbox.lock") {
+$inboxdir = abs_path($inboxdir);
+if (-f "$inboxdir/inbox.lock") {
        if (!defined $version) {
                $version = 2;
        } elsif ($version != 2) {
-               die "$mainrepo is a -V2 repo, -V$version specified\n"
+               die "$inboxdir is a -V2 repo, -V$version specified\n"
        }
-} elsif (-d "$mainrepo/objects") {
+} elsif (-d "$inboxdir/objects") {
        if (!defined $version) {
                $version = 1;
        } elsif ($version != 1) {
-               die "$mainrepo is a -V1 repo, -V$version specified\n"
+               die "$inboxdir is a -V1 repo, -V$version specified\n"
        }
 }
 
@@ -110,7 +134,7 @@ if ($version == 1 && defined $skip_epoch) {
 }
 
 my $ibx = PublicInbox::Inbox->new({
-       mainrepo => $mainrepo,
+       inboxdir => $inboxdir,
        name => $name,
        version => $version,
        -primary_address => $address[0],
@@ -128,7 +152,7 @@ foreach my $addr (@address) {
        x(@x, "--add", "$pfx.address", $addr);
 }
 x(@x, "$pfx.url", $http_url);
-x(@x, "$pfx.mainrepo", $mainrepo);
+x(@x, "$pfx.inboxdir", $inboxdir);
 
 if (defined($indexlevel)) {
        x(@x, "$pfx.indexlevel", $indexlevel);