X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=script%2Fpublic-inbox-init;h=8fd2f9dc2f5c490cb8325dbd8b6b74b91febd5be;hb=dde1b083571ed893cbb1990f01f9e11ed804cba5;hp=fdad1366475a079120f064667719543d73450910;hpb=24294059123d4edd9e31f211d72c641a5d1a0d72;p=public-inbox.git
diff --git a/script/public-inbox-init b/script/public-inbox-init
index fdad1366..8fd2f9dc 100755
--- a/script/public-inbox-init
+++ b/script/public-inbox-init
@@ -1,23 +1,35 @@
#!/usr/bin/perl -w
-# Copyright (C) 2014-2018 all contributors
+# 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..]";
+my $usage = "public-inbox-init NAME INBOX_DIR HTTP_URL ADDRESS [ADDRESS..]";
use Getopt::Long qw/:config gnu_getopt no_ignore_case auto_abbrev/;
-use PublicInbox::Config;
+use PublicInbox::Admin;
+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" }
sub usage { print STDERR "Usage: $usage\n"; exit 1 }
-my $version = 1;
-my %opts = ( 'V|version=i' => \$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 $http_url = shift @ARGV or usage();
@@ -28,11 +40,34 @@ 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";
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,6 +99,13 @@ 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";
@@ -71,32 +113,40 @@ my $pfx = "publicinbox.$name";
my @x = (qw/git config/, "--file=$pi_config_tmp");
$mainrepo = abs_path($mainrepo);
+if (-f "$mainrepo/inbox.lock") {
+ if (!defined $version) {
+ $version = 2;
+ } elsif ($version != 2) {
+ die "$mainrepo is a -V2 repo, -V$version specified\n"
+ }
+} elsif (-d "$mainrepo/objects") {
+ if (!defined $version) {
+ $version = 1;
+ } elsif ($version != 1) {
+ die "$mainrepo is a -V1 repo, -V$version specified\n"
+ }
+}
+
+$version = 1 unless defined $version;
-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);
- my $v2w = PublicInbox::V2Writable->new($ibx, 1);
- $v2w->{parallel} = 0;
- $v2w->idx_init;
- $v2w->git_init(0);
- $v2w->done;
-} 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";
+if ($version == 1 && defined $skip_epoch) {
+ die "--skip-epoch is only supported for -V2 repos\n";
}
+my $ibx = PublicInbox::Inbox->new({
+ mainrepo => $mainrepo,
+ 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);
@@ -104,5 +154,15 @@ foreach my $addr (@address) {
x(@x, "$pfx.url", $http_url);
x(@x, "$pfx.mainrepo", $mainrepo);
+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";