|
 |
0f9cf8 |
diff --git a/Cassandane/Instance.pm b/cassandane/Cassandane/Instance.pm
|
|
|
0f9cf8 |
index 1561143..c60396e 100644
|
|
|
0f9cf8 |
--- a/Cassandane/Instance.pm
|
|
|
0f9cf8 |
+++ b/Cassandane/Instance.pm
|
|
|
0f9cf8 |
@@ -166,7 +166,7 @@ sub get_version
|
|
|
0f9cf8 |
my $cyrus_master;
|
|
|
0f9cf8 |
foreach my $d (qw( bin sbin libexec libexec/cyrus-imapd lib cyrus/bin ))
|
|
|
0f9cf8 |
{
|
|
|
0f9cf8 |
- my $try = "$cyrus_destdir$cyrus_prefix/$d/master";
|
|
|
0f9cf8 |
+ my $try = "$cyrus_destdir$cyrus_prefix/$d/cyrus-master";
|
|
|
0f9cf8 |
if (-x $try) {
|
|
|
0f9cf8 |
$cyrus_master = $try;
|
|
|
0f9cf8 |
last;
|
|
|
0f9cf8 |
diff --git a/Cassandane/Instance.pm b/Cassandane/Instance.pm
|
|
|
0f9cf8 |
index c60396e..7b2883a 100644
|
|
|
0f9cf8 |
--- a/Cassandane/Instance.pm
|
|
|
0f9cf8 |
+++ b/Cassandane/Instance.pm
|
|
|
0f9cf8 |
@@ -546,7 +546,7 @@ sub _pid_file
|
|
|
0f9cf8 |
{
|
|
|
0f9cf8 |
my ($self, $name) = @_;
|
|
|
0f9cf8 |
|
|
|
0f9cf8 |
- $name ||= 'master';
|
|
|
0f9cf8 |
+ $name ||= 'cyrus-master';
|
|
|
0f9cf8 |
|
|
|
0f9cf8 |
return $self->{basedir} . "/run/$name.pid";
|
|
|
0f9cf8 |
}
|
|
|
0f9cf8 |
@@ -569,7 +569,7 @@ sub _list_pid_files
|
|
|
0f9cf8 |
closedir(RUNDIR);
|
|
|
0f9cf8 |
|
|
|
0f9cf8 |
@pidfiles = sort { $a cmp $b } @pidfiles;
|
|
|
0f9cf8 |
- @pidfiles = ( 'master', grep { $_ ne 'master' } @pidfiles );
|
|
|
0f9cf8 |
+ @pidfiles = ( 'cyrus-master', grep { $_ ne 'cyrus-master' } @pidfiles );
|
|
|
0f9cf8 |
|
|
|
0f9cf8 |
return @pidfiles;
|
|
|
0f9cf8 |
}
|
|
|
0f9cf8 |
@@ -877,7 +877,7 @@ sub _start_master
|
|
|
0f9cf8 |
# Now start the master process.
|
|
|
0f9cf8 |
my @cmd =
|
|
|
0f9cf8 |
(
|
|
|
0f9cf8 |
- 'master',
|
|
|
0f9cf8 |
+ 'cyrus-master',
|
|
|
0f9cf8 |
# The following is added automatically by _fork_command:
|
|
|
0f9cf8 |
# '-C', $self->_imapd_conf(),
|
|
|
0f9cf8 |
'-l', '255',
|
|
|
0f9cf8 |
@@ -886,7 +886,7 @@ sub _start_master
|
|
|
0f9cf8 |
'-M', $self->_master_conf(),
|
|
|
0f9cf8 |
);
|
|
|
0f9cf8 |
if (get_verbose) {
|
|
|
0f9cf8 |
- my $logfile = $self->{basedir} . '/conf/master.log';
|
|
|
0f9cf8 |
+ my $logfile = $self->{basedir} . '/conf/cyrus-master.log';
|
|
|
0f9cf8 |
xlog "_start_master: logging to $logfile";
|
|
|
0f9cf8 |
push(@cmd, '-L', $logfile);
|
|
|
0f9cf8 |
}
|
|
|
0f9cf8 |
diff --git a/Cassandane/Instance.pm b/Cassandane/Instance.pm
|
|
|
0f9cf8 |
index 7b2883a..0c1e5fb 100644
|
|
|
0f9cf8 |
--- a/Cassandane/Instance.pm
|
|
|
0f9cf8 |
+++ b/Cassandane/Instance.pm
|
|
|
0f9cf8 |
@@ -1301,7 +1301,7 @@ sub send_sighup
|
|
|
0f9cf8 |
return if ($self->{_stopped});
|
|
|
0f9cf8 |
xlog "sighup";
|
|
|
0f9cf8 |
|
|
|
0f9cf8 |
- my $pid = $self->_read_pid_file('master') or return;
|
|
|
0f9cf8 |
+ my $pid = $self->_read_pid_file('cyrus-master') or return;
|
|
|
0f9cf8 |
kill(SIGHUP, $pid) or die "Can't send signal SIGHUP to pid $pid: $!";
|
|
|
0f9cf8 |
return 1;
|
|
|
0f9cf8 |
}
|