#!/usr/bin/perl -w
-# Copyright (C) 2014-2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2014-2020 all contributors <meta@public-inbox.org>
# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
#
# Initializes a public-inbox, basically a wrapper for git-init(1)
use strict;
use warnings;
-my $usage = "public-inbox-init NAME REPO_DIR HTTP_URL ADDRESS [ADDRESS..]";
+sub usage {
+ print STDERR <<EOF;
+Usage: public-inbox-init NAME INBOX_DIR HTTP_URL ADDRESS [ADDRESS..]
+EOF
+ exit 1;
+}
use Getopt::Long qw/:config gnu_getopt no_ignore_case auto_abbrev/;
use PublicInbox::Admin;
PublicInbox::Admin::require_or_die('-base');
-require PublicInbox::Config;
-require PublicInbox::Inbox;
+use PublicInbox::Config;
+use PublicInbox::InboxWritable;
+use PublicInbox::Import;
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" }
-sub usage { print STDERR "Usage: $usage\n"; exit 1 }
my $version = undef;
my $indexlevel = undef;
-my $skip;
-my %opts = ( 'V|version=i' => \$version,
- 'L|indexlevel=s' => \$indexlevel,
- 'S|skip=i' => \$skip,
+my $skip_epoch;
+my %opts = (
+ 'V|version=i' => \$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 $mainrepo = shift @ARGV or usage();
+my $inboxdir = shift @ARGV or usage();
my $http_url = shift @ARGV or usage();
my (@address) = @ARGV;
@address or usage();
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 {
+ 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 $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"
}
}
$version = 1 unless defined $version;
-if ($version == 1 && defined $skip) {
- die "--skip is only supported for -V2 repos\n";
+if ($version == 1 && defined $skip_epoch) {
+ die "--skip-epoch is only supported for -V2 repos\n";
}
my $ibx = PublicInbox::Inbox->new({
- mainrepo => $mainrepo,
+ inboxdir => $inboxdir,
name => $name,
version => $version,
-primary_address => $address[0],
indexlevel => $indexlevel,
});
-if ($version >= 2) {
- require PublicInbox::V2Writable;
- PublicInbox::V2Writable->new($ibx, 1)->init_inbox(0, $skip);
-} elsif ($version == 1) {
- require PublicInbox::V1Writable;
- PublicInbox::V1Writable->new($ibx, 1)->init_inbox(0, $skip);
-} else {
- die "Unsupported -V/--version: $version\n";
-}
+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);
+ PublicInbox::Import::run_die([@x, "--add", "$pfx.address", $addr]);
}
-x(@x, "$pfx.url", $http_url);
-x(@x, "$pfx.mainrepo", $mainrepo);
+PublicInbox::Import::run_die([@x, "$pfx.url", $http_url]);
+PublicInbox::Import::run_die([@x, "$pfx.inboxdir", $inboxdir]);
if (defined($indexlevel)) {
- x(@x, "$pfx.indexlevel", $indexlevel);
+ PublicInbox::Import::run_die([@x, "$pfx.indexlevel", $indexlevel]);
}
# needed for git prior to v2.1.0
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;
+
+sub new {
+ my ($klass, $file) = @_;
+ bless { file => $file }, $klass;
+}
+
+sub DESTROY {
+ my $f = delete($_[0]->{file});
+ unlink($f) if defined($f);
+}
+1;