Merge branch 'master' into improve_no_result_page

Author: oiami

bin/daemon-control.pl

@@ -6,15 +6,21 @@
 use warnings;
 
 use Daemon::Control;
-use Sys::Hostname qw( hostname );
-
-my $name    = 'metacpan-www';
-my $user    = 'metacpan';
-my $home    = '/home/metacpan/metacpan.org';
+use File::Path 2.06 ();    # core
+
+my $name = 'metacpan-www';
+my $user = 'metacpan';
+my $root = '/home/metacpan';
+my $home = "$root/metacpan.org";
+my %dirs = (
+    pid => "$home/var/run",
+    log => "$home/var/log",
+);
 my $carton  = '/usr/local/perlbrew/perls/perl-5.16.2/bin/carton';
 my $workers = 7;
 
-if ( hostname() eq 'debian' ) {
+# If running in the development vm change the user to avoid permission problems.
+if ( -d '/vagrant' ) {
     $user    = 'vagrant';
     $workers = 3;
 }
@@ -29,6 +35,8 @@
     '-s', => 'Starman',
 );
 
+File::Path::make_path( values %dirs );
+
 # Notes on unused args
 # scan_name: seems to be just 'starman master' (not useful)
 # stdout_file: always seems to be just empty
@@ -37,15 +45,15 @@
     directory    => $home,
     fork         => 2,
     group        => $user,
-    init_config  => "$home/.metacpanrc",
+    init_config  => "$root/.metacpanrc",
     lsb_desc     => "Starts $name",
     lsb_sdesc    => "Starts $name",
     name         => $name,
     path         => "$home/bin/daemon-control.pl",
-    pid_file     => "$home/var/run/$name.pid",
+    pid_file     => "$dirs{pid}/$name.pid",
     program      => $carton,
     program_args => \@program_args,
-    stderr_file  => "$home/var/logs/starman_error.log",
+    stderr_file  => "$dirs{log}/starman_error.log",
     user         => $user,
 };
 

git/hooks/pre-commit

@@ -2,6 +2,8 @@
 
 use strict;
 use warnings;
+# Hack to use carton's local::lib.
+use lib 'local/lib/perl5';
 
 use Code::TidyAll::Git::Precommit;
 Code::TidyAll::Git::Precommit->check();