sipwise
/
ngcp-panel
mirror of https://github.com/sipwise/ngcp-panel.git
1
0
Fork 0
Code Issues Releases Wiki Activity

TT#53701 Move config files under etc/

Browse Source 
Change-Id: I3e1e01a6c669cf0506c0c3b1ada7f4144f254c1d
changes/65/28465/2
Guillem Jover 6 years ago
parent 6c816dfe93
commit 363da116ad
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File

4
debian/ngcp-panel.install vendored
Unescape View File

@ -1,6 +1,6 @@
etc/logging.conf etc/ngcp-panel/
etc/ngcp_panel.conf etc/ngcp-panel/
lib/NGCP/Panel/I18N/* usr/share/perl5/NGCP/Panel/I18N
logging.conf etc/ngcp-panel/
ngcp_panel.conf etc/ngcp-panel/
ngcp_panel.psgi usr/share/ngcp-panel/
script/* usr/share/ngcp-panel/script
script/ngcp_panel_fastcgi.pl usr/share/ngcp-panel/

0
logging.conf → etc/logging.conf
Unescape View File

0
ngcp_panel.conf → etc/ngcp_panel.conf
Unescape View File

2
lib/NGCP/Panel.pm
Unescape View File

@ -40,7 +40,7 @@ for my $path(qw#/etc/ngcp-panel/ngcp_panel.conf etc/ngcp_panel.conf ngcp_panel.c
last;
}
}
$panel_config //= 'ngcp_panel.conf';
$panel_config //= 'etc/ngcp_panel.conf';
sub get_panel_config{
my $config;

4
t/api-rest/api-balanceintervals.t
Unescape View File

@ -36,7 +36,7 @@ my $disable_hourly_intervals = 1;
use Config::General;
my $catalyst_config;
if ($is_local_env) {
$catalyst_config = Config::General->new("../../ngcp_panel.conf");
$catalyst_config = Config::General->new("../../etc/ngcp_panel.conf");
} else {
#taken 1:1 from /lib/NGCP/Panel.pm
my $panel_config;
@ -46,7 +46,7 @@ if ($is_local_env) {
last;
}
}
$panel_config //= 'ngcp_panel.conf';
$panel_config //= 'etc/ngcp_panel.conf';
$catalyst_config = Config::General->new($panel_config);
}
my %config = $catalyst_config->getall();

4
t/api-rest/api-journals.t
Unescape View File

@ -25,7 +25,7 @@ my $test_start_datetime;
use Config::General;
my $catalyst_config;
if ($is_local_env) {
$catalyst_config = Config::General->new("../../ngcp_panel.conf");
$catalyst_config = Config::General->new("../../etc/ngcp_panel.conf");
} else {
#taken 1:1 from /lib/NGCP/Panel.pm
my $panel_config;
@ -35,7 +35,7 @@ if ($is_local_env) {
last;
}
}
$panel_config //= 'ngcp_panel.conf';
$panel_config //= 'etc/ngcp_panel.conf';
$catalyst_config = Config::General->new($panel_config);
}
my %config = $catalyst_config->getall();

4
t/api-rest/api-topuplogs.t
Unescape View File

@ -20,7 +20,7 @@ my $is_local_env = 0;
use Config::General;
my $catalyst_config;
if ($is_local_env) {
$catalyst_config = Config::General->new("../../ngcp_panel.conf");
$catalyst_config = Config::General->new("../../etc/ngcp_panel.conf");
} else {
#taken 1:1 from /lib/NGCP/Panel.pm
my $panel_config;
@ -30,7 +30,7 @@ if ($is_local_env) {
last;
}
}
$panel_config //= 'ngcp_panel.conf';
$panel_config //= 'etc/ngcp_panel.conf';
$catalyst_config = Config::General->new($panel_config);
}
my %config = $catalyst_config->getall();

Write Preview
Loading…
Cancel
Save