135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor web start scripts to be more portable

Browse Source
This commit is contained in:
Oliver Gorwits
2013-03-04 00:19:18 +00:00
parent 8e9466b64f
commit d82fe1e2b0
5 changed files with 39 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Netdisco/Makefile.PL
View File

@@ -4,6 +4,8 @@ name 'App-Netdisco';
license 'bsd'; license 'bsd';
all_from 'lib/App/Netdisco.pm'; all_from 'lib/App/Netdisco.pm';
requires 'App::cpanminus' => 0;
requires 'App::local::lib::helper' => 0;
requires 'DBD::Pg' => 0; requires 'DBD::Pg' => 0;
requires 'DBD::SQLite' => 0; requires 'DBD::SQLite' => 0;
requires 'DBIx::Class' => 0; requires 'DBIx::Class' => 0;
@@ -20,11 +22,11 @@ requires 'MCE' => 1.305;
requires 'Net::MAC' => 0; requires 'Net::MAC' => 0;
requires 'NetAddr::IP' => 0; requires 'NetAddr::IP' => 0;
requires 'Path::Class' => 0; requires 'Path::Class' => 0;
requires 'Plack' => 0;
requires 'Role::Tiny' => 0; requires 'Role::Tiny' => 0;
requires 'Socket6' => 0;
requires 'Starman' => 0;
requires 'SNMP::Info' => '2.11'; requires 'SNMP::Info' => '2.11';
requires 'SQL::Translator' => 0; requires 'SQL::Translator' => 0;
requires 'Socket6' => 0;
requires 'Template' => 0; requires 'Template' => 0;
requires 'YAML' => 0; requires 'YAML' => 0;
requires 'namespace::clean' => 0; requires 'namespace::clean' => 0;

21
Netdisco/bin/netdisco-web
View File

@@ -2,23 +2,26 @@
use strict; use strict;
use warnings FATAL => 'all'; use warnings FATAL => 'all';
use FindBin;
FindBin::again();
use Path::Class; use Path::Class;
use Daemon::Control;
BEGIN { my $home = ($ENV{NETDISCO_HOME} || $ENV{HOME});
eval "use Daemon::Control"; my $netdisco = file($FindBin::RealBin, 'netdisco-web-fg');
if ($@) {
exec(file($ENV{HOME}, 'bin', 'localenv'), $0, @ARGV);
}
}
my $log_dir = dir($ENV{HOME}, 'logs'); my $log_dir = dir($home, 'logs');
mkdir $log_dir if ! -d $log_dir; mkdir $log_dir if ! -d $log_dir;
my @args = (scalar @ARGV > 1 ? @ARGV[1 .. $#ARGV] : ());
Daemon::Control->new({ Daemon::Control->new({
name => 'Netdisco Web', name => 'Netdisco Web',
program => 'plackup', program => 'plackup',
program_args => [file($ENV{HOME}, 'bin', 'netdisco-web-fg')], program_args => [@args, $netdisco->stringify],
pid_file => file($ENV{HOME}, 'netdisco-web.pid'), pid_file => file($home, 'netdisco-web.pid'),
stderr_file => file($log_dir, 'netdisco-web.log'), stderr_file => file($log_dir, 'netdisco-web.log'),
stdout_file => file($log_dir, 'netdisco-web.log'), stdout_file => file($log_dir, 'netdisco-web.log'),
})->run; })->run;

25
Netdisco/bin/netdisco-web-fg
View File

@@ -1,9 +1,28 @@
#!/usr/bin/env perl #!/usr/bin/env perl
use FindBin; use strict;
use lib "$FindBin::Bin/../lib"; use warnings FATAL => 'all';
use App::Netdisco;
BEGIN {
# stuff useful locations into @INC and $PATH
use Config;
use FindBin;
FindBin::again();
use Path::Class 'dir';
my $location = $FindBin::RealBin;
$ENV{PATH} = $location . $Config{path_sep} . $ENV{PATH};
unshift @INC,
dir($location)->parent->subdir('lib')->stringify,
dir($location, 'lib')->stringify;
}
use App::Netdisco;
use Dancer; use Dancer;
debug sprintf "App::Netdisco %s", ($App::Netdisco::VERSION || 'HEAD');
my $home = ($ENV{NETDISCO_HOME} || $ENV{HOME});
set('session_dir', dir($home, 'netdisco-web-sessions'));
use App::Netdisco::Web; use App::Netdisco::Web;
dance; dance;

2
Netdisco/lib/App/Netdisco.pm
View File

@@ -7,7 +7,7 @@ use 5.010_000;
use File::ShareDir 'dist_dir'; use File::ShareDir 'dist_dir';
use Path::Class; use Path::Class;
our $VERSION = '2.005000_002'; our $VERSION = '2.005000_003';
BEGIN { BEGIN {
if (not length ($ENV{DANCER_APPDIR} || '') if (not length ($ENV{DANCER_APPDIR} || '')

5
Netdisco/lib/App/Netdisco/Web.pm
View File

@@ -15,11 +15,6 @@ use App::Netdisco::Web::Device;
use App::Netdisco::Web::TypeAhead; use App::Netdisco::Web::TypeAhead;
use App::Netdisco::Web::PortControl; use App::Netdisco::Web::PortControl;
# need to set at runtime the sessions dir in user home
# because YAML config (session_dir) cannot interpolate $ENV{HOME}
use Path::Class 'dir';
set('session_dir', dir($ENV{HOME}, 'netdisco-web-sessions'));
sub _load_web_plugins { sub _load_web_plugins {
my $plugin_list = shift; my $plugin_list = shift;