From ed02cf232db9e41768c2313ebdb467cf1bdf40e7 Mon Sep 17 00:00:00 2001 From: Andreas Granig Date: Sun, 4 Aug 2013 21:38:11 +0200 Subject: [PATCH] Fix paths and debian packaging. Look for templates and static files in /usr/share/ngcp-panel. Actually package the share/ folder. Add config file to /etc/ngcp-panel/ngcp_panel.conf --- debian/control | 2 ++ debian/ngcp-panel.install | 2 ++ lib/NGCP/Panel.pm | 6 ++++++ 3 files changed, 10 insertions(+) create mode 100644 debian/ngcp-panel.install diff --git a/debian/control b/debian/control index ae8e58a339..a3e62629da 100644 --- a/debian/control +++ b/debian/control @@ -32,6 +32,7 @@ Build-Depends: debhelper (>= 8), libtrycatch-perl, libhash-merge-simple-perl, liburi-encode-perl, + libdata-printer-perl, ngcp-schema Standards-Version: 3.9.4 Homepage: http://sipwise.com/ @@ -68,6 +69,7 @@ Depends: libcatalyst-actionrole-acl-perl, libtext-csv-xs-perl, libhash-merge-simple-perl, liburi-encode-perl, + libdata-printer-perl, ngcp-schema, ${misc:Depends}, ${perl:Depends} diff --git a/debian/ngcp-panel.install b/debian/ngcp-panel.install new file mode 100644 index 0000000000..9fe67f168b --- /dev/null +++ b/debian/ngcp-panel.install @@ -0,0 +1,2 @@ +share/* usr/share/ +ngcp_panel.conf etc/ngcp-panel/ diff --git a/lib/NGCP/Panel.pm b/lib/NGCP/Panel.pm index e15263f95e..5e48586909 100644 --- a/lib/NGCP/Panel.pm +++ b/lib/NGCP/Panel.pm @@ -45,8 +45,13 @@ __PACKAGE__->config( disable_component_resolution_regex_fallback => 1, enable_catalyst_header => 1, # Send X-Catalyst header encoding => 'UTF-8', + 'Plugin::ConfigLoader' => { + file => '/etc/ngcp-panel/ngcp_panel.conf', + }, 'View::HTML' => { INCLUDE_PATH => [ + '/usr/share/ngcp-panel/templates', + '/usr/share/ngcp-panel/layout', __PACKAGE__->path_to('share', 'templates'), __PACKAGE__->path_to('share', 'layout'), ], @@ -61,6 +66,7 @@ __PACKAGE__->config( 'Plugin::Static::Simple' => { include_path => [ + '/usr/share/ngcp-panel/static', __PACKAGE__->path_to('share', 'static'), ], mime_types => {