X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=script%2Fpublic-inbox-init;h=10d3ad45b2e6edb70ac51f809bb0b1d16d64a8b4;hb=6ebcec3add4d6aeff6e3b3eb019a404528c079ec;hp=86cf8b5608136de44e17dc78808a9ebcafbeefd2;hpb=54590383027a67d11953690cbb6390347757730b;p=public-inbox.git
diff --git a/script/public-inbox-init b/script/public-inbox-init
index 86cf8b56..10d3ad45 100755
--- a/script/public-inbox-init
+++ b/script/public-inbox-init
@@ -1,25 +1,41 @@
#!/usr/bin/perl -w
-# Copyright (C) 2014-2018 all contributors
+# Copyright (C) 2014-2020 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 );
+my $version = undef;
+my $indexlevel = undef;
+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();
@@ -28,11 +44,32 @@ 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 {
+ 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);
- my $perm = $st[2];
+ $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";
@@ -64,41 +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 $pi_config_tmp: $!\n";
my $pfx = "publicinbox.$name";
my @x = (qw/git config/, "--file=$pi_config_tmp");
-$mainrepo = abs_path($mainrepo);
-
-if ($version >= 2) {
- require PublicInbox::V2Writable;
- require PublicInbox::Inbox;
- my $ibx = {
- mainrepo => $mainrepo,
- name => $name,
- version => $version,
- -primary_address => $address[0],
- };
- $ibx = PublicInbox::Inbox->new($ibx);
- PublicInbox::V2Writable->new($ibx, 1)->init_inbox(0);
-} elsif ($version == 1) {
- x(qw(git init -q --bare), $mainrepo);
-
- # set a reasonable default:
- x(qw/git config/, "--file=$mainrepo/config",
- 'repack.writeBitmaps', 'true');
-} else {
- die "Unsupported -V/--version: $version\n";
+$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);
+ PublicInbox::Import::run_die([@x, "--add", "$pfx.address", $addr]);
+}
+PublicInbox::Import::run_die([@x, "$pfx.url", $http_url]);
+PublicInbox::Import::run_die([@x, "$pfx.inboxdir", $inboxdir]);
+
+if (defined($indexlevel)) {
+ PublicInbox::Import::run_die([@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";
}
-x(@x, "$pfx.url", $http_url);
-x(@x, "$pfx.mainrepo", $mainrepo);
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;