From 05086e8b780e36ea69b79bcc8a3de5a00b0e5f7b Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Mon, 17 Dec 2012 18:31:16 +0000 Subject: [PATCH] make an App::Netdisco dist using Module::Install --- .gitignore | 2 +- Changes | 1 + Netdisco/MANIFEST | 131 ++++++++++++++++++ Netdisco/MANIFEST.SKIP | 70 ++++++++++ Netdisco/Makefile.PL | 44 ++++++ Netdisco/bin/config.yml | 1 - Netdisco/bin/nd-dbic-versions | 16 ++- Netdisco/bin/netdisco-daemon | 6 +- Netdisco/bin/netdisco-db-deploy | 5 +- Netdisco/bin/netdisco-web | 6 +- Netdisco/lib/App/Netdisco.pm | 44 ++++++ Netdisco/lib/{ => App}/Netdisco/DB.pm | 4 +- .../lib/{ => App}/Netdisco/DB/Result/Admin.pm | 2 +- .../{ => App}/Netdisco/DB/Result/Device.pm | 10 +- .../{ => App}/Netdisco/DB/Result/DeviceIp.pm | 6 +- .../Netdisco/DB/Result/DeviceModule.pm | 2 +- .../Netdisco/DB/Result/DevicePort.pm | 20 +-- .../Netdisco/DB/Result/DevicePortLog.pm | 2 +- .../Netdisco/DB/Result/DevicePortPower.pm | 4 +- .../Netdisco/DB/Result/DevicePortSsid.pm | 2 +- .../Netdisco/DB/Result/DevicePortVlan.pm | 8 +- .../Netdisco/DB/Result/DevicePortWireless.pm | 2 +- .../Netdisco/DB/Result/DevicePower.pm | 2 +- .../Netdisco/DB/Result/DeviceRoute.pm | 2 +- .../Netdisco/DB/Result/DeviceVlan.pm | 8 +- .../lib/{ => App}/Netdisco/DB/Result/Log.pm | 2 +- .../lib/{ => App}/Netdisco/DB/Result/Node.pm | 10 +- .../{ => App}/Netdisco/DB/Result/NodeIp.pm | 8 +- .../Netdisco/DB/Result/NodeMonitor.pm | 2 +- .../{ => App}/Netdisco/DB/Result/NodeNbt.pm | 2 +- .../Netdisco/DB/Result/NodeWireless.pm | 2 +- .../lib/{ => App}/Netdisco/DB/Result/Oui.pm | 2 +- .../{ => App}/Netdisco/DB/Result/Process.pm | 2 +- .../{ => App}/Netdisco/DB/Result/Session.pm | 2 +- .../{ => App}/Netdisco/DB/Result/Subnet.pm | 2 +- .../{ => App}/Netdisco/DB/Result/Topology.pm | 2 +- .../lib/{ => App}/Netdisco/DB/Result/User.pm | 2 +- .../{ => App}/Netdisco/DB/Result/UserLog.pm | 2 +- .../Netdisco/DB/Result/Virtual/ActiveNode.pm | 4 +- .../DB/Result/Virtual/ActiveNodeWithAge.pm | 4 +- .../Netdisco/DB/Result/Virtual/DeviceLinks.pm | 2 +- .../DB/Result/Virtual/DevicePortVlanNative.pm | 4 +- .../DB/Result/Virtual/DevicePortVlanTagged.pm | 4 +- .../Netdisco/DB/Result/Virtual/NodeWithAge.pm | 4 +- .../{ => App}/Netdisco/DB/ResultSet/Device.pm | 2 +- .../Netdisco/DB/ResultSet/DevicePort.pm | 2 +- .../{ => App}/Netdisco/DB/ResultSet/Node.pm | 2 +- .../{ => App}/Netdisco/DB/ResultSet/NodeIp.pm | 2 +- .../Netdisco-DB-1-2-PostgreSQL.sql | 0 .../Netdisco-DB-1-3-PostgreSQL.sql | 0 .../Netdisco-DB-1-PostgreSQL.sql | 0 .../Netdisco-DB-2-3-PostgreSQL.sql | 0 .../Netdisco-DB-2-PostgreSQL.sql | 0 .../Netdisco-DB-3-PostgreSQL.sql | 0 Netdisco/lib/{ => App}/Netdisco/Daemon/DB.pm | 4 +- .../Netdisco/Daemon/DB/Result/Admin.pm | 2 +- .../Netdisco/Daemon/Worker/Interactive.pm | 6 +- .../Worker/Interactive/DeviceActions.pm | 6 +- .../Daemon/Worker/Interactive/PortActions.pm | 8 +- .../Daemon/Worker/Interactive/Util.pm | 2 +- .../Netdisco/Daemon/Worker/Manager.pm | 4 +- .../lib/{ => App}/Netdisco/Util/Connect.pm | 4 +- .../Netdisco/Util/DeviceProperties.pm | 4 +- .../{ => App}/Netdisco/Util/Permissions.pm | 6 +- Netdisco/lib/{ => App}/Netdisco/Util/Web.pm | 4 +- Netdisco/lib/{ => App}/Netdisco/Web.pm | 12 +- Netdisco/lib/{ => App}/Netdisco/Web/AuthN.pm | 2 +- Netdisco/lib/{ => App}/Netdisco/Web/Device.pm | 6 +- .../lib/{ => App}/Netdisco/Web/Inventory.pm | 2 +- .../lib/{ => App}/Netdisco/Web/PortControl.pm | 2 +- Netdisco/lib/{ => App}/Netdisco/Web/Search.pm | 2 +- Netdisco/lib/auto/App/Netdisco | 1 + Netdisco/{ => share}/config.yml | 0 .../{ => share}/environments/development.yml | 4 +- .../{ => share}/environments/production.yml | 4 +- Netdisco/{ => share}/public/500.html | 0 .../{ => share}/public/css/bootstrap.min.css | 0 .../{ => share}/public/css/font-awesome.css | 0 Netdisco/{ => share}/public/css/nd_print.css | 0 Netdisco/{ => share}/public/css/netdisco.css | 0 Netdisco/{ => share}/public/css/toastr.css | 0 Netdisco/{ => share}/public/dispatch.cgi | 0 Netdisco/{ => share}/public/dispatch.fcgi | 0 .../public/font/fontawesome-webfont.eot | Bin .../public/font/fontawesome-webfont.svg | 0 .../public/font/fontawesome-webfont.ttf | Bin .../public/font/fontawesome-webfont.woff | Bin .../public/images/crystalclear_mag.png | Bin .../public/images/diagona_settings.png | Bin .../public/images/dusseldorf_settings.png | Bin .../public/images/glyphicons_072_bookmark.png | Bin .../public/images/matte_basic_pin.png | Bin .../public/images/splashyfish_left.png | Bin .../public/images/splashyfish_right.png | Bin .../{ => share}/public/images/tango_sweep.png | Bin .../{ => share}/public/images/vaga_copy.png | Bin .../public/javascripts/bootstrap.min.js | 0 .../{ => share}/public/javascripts/d3.min.js | 0 .../public/javascripts/jquery-deserialize.js | 0 .../public/javascripts/jquery-history.js | 0 .../public/javascripts/jquery-latest.min.js | 0 .../public/javascripts/netdisco.js | 0 .../javascripts/netdisco_portcontrol.js | 0 .../{ => share}/public/javascripts/toastr.js | 0 .../views/ajax/device/addresses.tt | 0 .../{ => share}/views/ajax/device/details.tt | 0 .../{ => share}/views/ajax/device/netmap.tt | 0 .../{ => share}/views/ajax/device/ports.tt | 0 .../{ => share}/views/ajax/search/device.tt | 0 .../views/ajax/search/node_by_ip.tt | 0 .../views/ajax/search/node_by_mac.tt | 0 .../{ => share}/views/ajax/search/port.tt | 0 .../{ => share}/views/ajax/search/vlan.tt | 0 Netdisco/{ => share}/views/device.tt | 0 Netdisco/{ => share}/views/index.tt | 0 Netdisco/{ => share}/views/inventory.tt | 0 Netdisco/{ => share}/views/js/common.js | 0 Netdisco/{ => share}/views/js/device.js | 0 Netdisco/{ => share}/views/js/search.js | 0 Netdisco/{ => share}/views/layouts/main.tt | 0 Netdisco/{ => share}/views/report.tt | 0 Netdisco/{ => share}/views/search.tt | 0 .../{ => share}/views/sidebar/device/ports.tt | 0 .../views/sidebar/search/device.tt | 0 .../{ => share}/views/sidebar/search/node.tt | 0 125 files changed, 428 insertions(+), 127 deletions(-) create mode 100644 Netdisco/MANIFEST create mode 100644 Netdisco/MANIFEST.SKIP create mode 100644 Netdisco/Makefile.PL delete mode 120000 Netdisco/bin/config.yml create mode 100644 Netdisco/lib/App/Netdisco.pm rename Netdisco/lib/{ => App}/Netdisco/DB.pm (88%) rename Netdisco/lib/{ => App}/Netdisco/DB/Result/Admin.pm (97%) rename Netdisco/lib/{ => App}/Netdisco/DB/Result/Device.pm (92%) rename Netdisco/lib/{ => App}/Netdisco/DB/Result/DeviceIp.pm (85%) rename Netdisco/lib/{ => App}/Netdisco/DB/Result/DeviceModule.pm (96%) rename Netdisco/lib/{ => App}/Netdisco/DB/Result/DevicePort.pm (87%) rename Netdisco/lib/{ => App}/Netdisco/DB/Result/DevicePortLog.pm (95%) rename Netdisco/lib/{ => App}/Netdisco/DB/Result/DevicePortPower.pm (88%) rename Netdisco/lib/{ => App}/Netdisco/DB/Result/DevicePortSsid.pm (93%) rename Netdisco/lib/{ => App}/Netdisco/DB/Result/DevicePortVlan.pm (85%) rename Netdisco/lib/{ => App}/Netdisco/DB/Result/DevicePortWireless.pm (92%) rename Netdisco/lib/{ => App}/Netdisco/DB/Result/DevicePower.pm (93%) rename Netdisco/lib/{ => App}/Netdisco/DB/Result/DeviceRoute.pm (95%) rename Netdisco/lib/{ => App}/Netdisco/DB/Result/DeviceVlan.pm (84%) rename Netdisco/lib/{ => App}/Netdisco/DB/Result/Log.pm (95%) rename Netdisco/lib/{ => App}/Netdisco/DB/Result/Node.pm (90%) rename Netdisco/lib/{ => App}/Netdisco/DB/Result/NodeIp.pm (95%) rename Netdisco/lib/{ => App}/Netdisco/DB/Result/NodeMonitor.pm (94%) rename Netdisco/lib/{ => App}/Netdisco/DB/Result/NodeNbt.pm (96%) rename Netdisco/lib/{ => App}/Netdisco/DB/Result/NodeWireless.pm (96%) rename Netdisco/lib/{ => App}/Netdisco/DB/Result/Oui.pm (93%) rename Netdisco/lib/{ => App}/Netdisco/DB/Result/Process.pm (95%) rename Netdisco/lib/{ => App}/Netdisco/DB/Result/Session.pm (94%) rename Netdisco/lib/{ => App}/Netdisco/DB/Result/Subnet.pm (95%) rename Netdisco/lib/{ => App}/Netdisco/DB/Result/Topology.pm (88%) rename Netdisco/lib/{ => App}/Netdisco/DB/Result/User.pm (96%) rename Netdisco/lib/{ => App}/Netdisco/DB/Result/UserLog.pm (95%) rename Netdisco/lib/{ => App}/Netdisco/DB/Result/Virtual/ActiveNode.pm (78%) rename Netdisco/lib/{ => App}/Netdisco/DB/Result/Virtual/ActiveNodeWithAge.pm (82%) rename Netdisco/lib/{ => App}/Netdisco/DB/Result/Virtual/DeviceLinks.pm (93%) rename Netdisco/lib/{ => App}/Netdisco/DB/Result/Virtual/DevicePortVlanNative.pm (76%) rename Netdisco/lib/{ => App}/Netdisco/DB/Result/Virtual/DevicePortVlanTagged.pm (76%) rename Netdisco/lib/{ => App}/Netdisco/DB/Result/Virtual/NodeWithAge.pm (85%) rename Netdisco/lib/{ => App}/Netdisco/DB/ResultSet/Device.pm (99%) rename Netdisco/lib/{ => App}/Netdisco/DB/ResultSet/DevicePort.pm (98%) rename Netdisco/lib/{ => App}/Netdisco/DB/ResultSet/Node.pm (96%) rename Netdisco/lib/{ => App}/Netdisco/DB/ResultSet/NodeIp.pm (98%) rename Netdisco/lib/{ => App}/Netdisco/DB/schema_versions/Netdisco-DB-1-2-PostgreSQL.sql (100%) rename Netdisco/lib/{ => App}/Netdisco/DB/schema_versions/Netdisco-DB-1-3-PostgreSQL.sql (100%) rename Netdisco/lib/{ => App}/Netdisco/DB/schema_versions/Netdisco-DB-1-PostgreSQL.sql (100%) rename Netdisco/lib/{ => App}/Netdisco/DB/schema_versions/Netdisco-DB-2-3-PostgreSQL.sql (100%) rename Netdisco/lib/{ => App}/Netdisco/DB/schema_versions/Netdisco-DB-2-PostgreSQL.sql (100%) rename Netdisco/lib/{ => App}/Netdisco/DB/schema_versions/Netdisco-DB-3-PostgreSQL.sql (100%) rename Netdisco/lib/{ => App}/Netdisco/Daemon/DB.pm (78%) rename Netdisco/lib/{ => App}/Netdisco/Daemon/DB/Result/Admin.pm (93%) rename Netdisco/lib/{ => App}/Netdisco/Daemon/Worker/Interactive.pm (93%) rename Netdisco/lib/{ => App}/Netdisco/Daemon/Worker/Interactive/DeviceActions.pm (84%) rename Netdisco/lib/{ => App}/Netdisco/Daemon/Worker/Interactive/PortActions.pm (94%) rename Netdisco/lib/{ => App}/Netdisco/Daemon/Worker/Interactive/Util.pm (81%) rename Netdisco/lib/{ => App}/Netdisco/Daemon/Worker/Manager.pm (96%) rename Netdisco/lib/{ => App}/Netdisco/Util/Connect.pm (97%) rename Netdisco/lib/{ => App}/Netdisco/Util/DeviceProperties.pm (95%) rename Netdisco/lib/{ => App}/Netdisco/Util/Permissions.pm (91%) rename Netdisco/lib/{ => App}/Netdisco/Util/Web.pm (97%) rename Netdisco/lib/{ => App}/Netdisco/Web.pm (78%) rename Netdisco/lib/{ => App}/Netdisco/Web/AuthN.pm (96%) rename Netdisco/lib/{ => App}/Netdisco/Web/Device.pm (98%) rename Netdisco/lib/{ => App}/Netdisco/Web/Inventory.pm (90%) rename Netdisco/lib/{ => App}/Netdisco/Web/PortControl.pm (97%) rename Netdisco/lib/{ => App}/Netdisco/Web/Search.pm (99%) create mode 120000 Netdisco/lib/auto/App/Netdisco rename Netdisco/{ => share}/config.yml (100%) rename Netdisco/{ => share}/environments/development.yml (93%) rename Netdisco/{ => share}/environments/production.yml (91%) rename Netdisco/{ => share}/public/500.html (100%) rename Netdisco/{ => share}/public/css/bootstrap.min.css (100%) rename Netdisco/{ => share}/public/css/font-awesome.css (100%) rename Netdisco/{ => share}/public/css/nd_print.css (100%) rename Netdisco/{ => share}/public/css/netdisco.css (100%) rename Netdisco/{ => share}/public/css/toastr.css (100%) rename Netdisco/{ => share}/public/dispatch.cgi (100%) rename Netdisco/{ => share}/public/dispatch.fcgi (100%) rename Netdisco/{ => share}/public/font/fontawesome-webfont.eot (100%) rename Netdisco/{ => share}/public/font/fontawesome-webfont.svg (100%) rename Netdisco/{ => share}/public/font/fontawesome-webfont.ttf (100%) rename Netdisco/{ => share}/public/font/fontawesome-webfont.woff (100%) rename Netdisco/{ => share}/public/images/crystalclear_mag.png (100%) rename Netdisco/{ => share}/public/images/diagona_settings.png (100%) rename Netdisco/{ => share}/public/images/dusseldorf_settings.png (100%) rename Netdisco/{ => share}/public/images/glyphicons_072_bookmark.png (100%) rename Netdisco/{ => share}/public/images/matte_basic_pin.png (100%) rename Netdisco/{ => share}/public/images/splashyfish_left.png (100%) rename Netdisco/{ => share}/public/images/splashyfish_right.png (100%) rename Netdisco/{ => share}/public/images/tango_sweep.png (100%) rename Netdisco/{ => share}/public/images/vaga_copy.png (100%) rename Netdisco/{ => share}/public/javascripts/bootstrap.min.js (100%) rename Netdisco/{ => share}/public/javascripts/d3.min.js (100%) rename Netdisco/{ => share}/public/javascripts/jquery-deserialize.js (100%) rename Netdisco/{ => share}/public/javascripts/jquery-history.js (100%) rename Netdisco/{ => share}/public/javascripts/jquery-latest.min.js (100%) rename Netdisco/{ => share}/public/javascripts/netdisco.js (100%) rename Netdisco/{ => share}/public/javascripts/netdisco_portcontrol.js (100%) rename Netdisco/{ => share}/public/javascripts/toastr.js (100%) rename Netdisco/{ => share}/views/ajax/device/addresses.tt (100%) rename Netdisco/{ => share}/views/ajax/device/details.tt (100%) rename Netdisco/{ => share}/views/ajax/device/netmap.tt (100%) rename Netdisco/{ => share}/views/ajax/device/ports.tt (100%) rename Netdisco/{ => share}/views/ajax/search/device.tt (100%) rename Netdisco/{ => share}/views/ajax/search/node_by_ip.tt (100%) rename Netdisco/{ => share}/views/ajax/search/node_by_mac.tt (100%) rename Netdisco/{ => share}/views/ajax/search/port.tt (100%) rename Netdisco/{ => share}/views/ajax/search/vlan.tt (100%) rename Netdisco/{ => share}/views/device.tt (100%) rename Netdisco/{ => share}/views/index.tt (100%) rename Netdisco/{ => share}/views/inventory.tt (100%) rename Netdisco/{ => share}/views/js/common.js (100%) rename Netdisco/{ => share}/views/js/device.js (100%) rename Netdisco/{ => share}/views/js/search.js (100%) rename Netdisco/{ => share}/views/layouts/main.tt (100%) rename Netdisco/{ => share}/views/report.tt (100%) rename Netdisco/{ => share}/views/search.tt (100%) rename Netdisco/{ => share}/views/sidebar/device/ports.tt (100%) rename Netdisco/{ => share}/views/sidebar/search/device.tt (100%) rename Netdisco/{ => share}/views/sidebar/search/node.tt (100%) diff --git a/.gitignore b/.gitignore index ff0e9733..0bd0467a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -Netdisco/environments/* +Netdisco/share/environments/* Netdisco/logs/* *.swp *.pid diff --git a/Changes b/Changes index f3a1e37e..61f66863 100644 --- a/Changes +++ b/Changes @@ -2,6 +2,7 @@ [NEW FEATURES] + * Relocate into App::Netdisco namespace * Update OUI data when the DB schema is deployed/upgraded 2.00_008 - 2012-12-16 diff --git a/Netdisco/MANIFEST b/Netdisco/MANIFEST new file mode 100644 index 00000000..3f7f8043 --- /dev/null +++ b/Netdisco/MANIFEST @@ -0,0 +1,131 @@ +bin/nd-dbic-versions +bin/netdisco-daemon +bin/netdisco-db-deploy +bin/netdisco-web +inc/Module/Install.pm +inc/Module/Install/Base.pm +inc/Module/Install/Can.pm +inc/Module/Install/Fetch.pm +inc/Module/Install/Makefile.pm +inc/Module/Install/Metadata.pm +inc/Module/Install/Scripts.pm +inc/Module/Install/Share.pm +inc/Module/Install/Win32.pm +inc/Module/Install/WriteAll.pm +lib/App/Netdisco.pm +lib/App/Netdisco/Daemon/DB.pm +lib/App/Netdisco/Daemon/DB/Result/Admin.pm +lib/App/Netdisco/Daemon/Worker/Interactive.pm +lib/App/Netdisco/Daemon/Worker/Interactive/DeviceActions.pm +lib/App/Netdisco/Daemon/Worker/Interactive/PortActions.pm +lib/App/Netdisco/Daemon/Worker/Interactive/Util.pm +lib/App/Netdisco/Daemon/Worker/Manager.pm +lib/App/Netdisco/DB.pm +lib/App/Netdisco/DB/Result/Admin.pm +lib/App/Netdisco/DB/Result/Device.pm +lib/App/Netdisco/DB/Result/DeviceIp.pm +lib/App/Netdisco/DB/Result/DeviceModule.pm +lib/App/Netdisco/DB/Result/DevicePort.pm +lib/App/Netdisco/DB/Result/DevicePortLog.pm +lib/App/Netdisco/DB/Result/DevicePortPower.pm +lib/App/Netdisco/DB/Result/DevicePortSsid.pm +lib/App/Netdisco/DB/Result/DevicePortVlan.pm +lib/App/Netdisco/DB/Result/DevicePortWireless.pm +lib/App/Netdisco/DB/Result/DevicePower.pm +lib/App/Netdisco/DB/Result/DeviceRoute.pm +lib/App/Netdisco/DB/Result/DeviceVlan.pm +lib/App/Netdisco/DB/Result/Log.pm +lib/App/Netdisco/DB/Result/Node.pm +lib/App/Netdisco/DB/Result/NodeIp.pm +lib/App/Netdisco/DB/Result/NodeMonitor.pm +lib/App/Netdisco/DB/Result/NodeNbt.pm +lib/App/Netdisco/DB/Result/NodeWireless.pm +lib/App/Netdisco/DB/Result/Oui.pm +lib/App/Netdisco/DB/Result/Process.pm +lib/App/Netdisco/DB/Result/Session.pm +lib/App/Netdisco/DB/Result/Subnet.pm +lib/App/Netdisco/DB/Result/Topology.pm +lib/App/Netdisco/DB/Result/User.pm +lib/App/Netdisco/DB/Result/UserLog.pm +lib/App/Netdisco/DB/Result/Virtual/ActiveNode.pm +lib/App/Netdisco/DB/Result/Virtual/ActiveNodeWithAge.pm +lib/App/Netdisco/DB/Result/Virtual/DeviceLinks.pm +lib/App/Netdisco/DB/Result/Virtual/DevicePortVlanNative.pm +lib/App/Netdisco/DB/Result/Virtual/DevicePortVlanTagged.pm +lib/App/Netdisco/DB/Result/Virtual/NodeWithAge.pm +lib/App/Netdisco/DB/ResultSet/Device.pm +lib/App/Netdisco/DB/ResultSet/DevicePort.pm +lib/App/Netdisco/DB/ResultSet/Node.pm +lib/App/Netdisco/DB/ResultSet/NodeIp.pm +lib/App/Netdisco/DB/schema_versions/Netdisco-DB-1-2-PostgreSQL.sql +lib/App/Netdisco/DB/schema_versions/Netdisco-DB-1-3-PostgreSQL.sql +lib/App/Netdisco/DB/schema_versions/Netdisco-DB-1-PostgreSQL.sql +lib/App/Netdisco/DB/schema_versions/Netdisco-DB-2-3-PostgreSQL.sql +lib/App/Netdisco/DB/schema_versions/Netdisco-DB-2-PostgreSQL.sql +lib/App/Netdisco/DB/schema_versions/Netdisco-DB-3-PostgreSQL.sql +lib/App/Netdisco/Util/Connect.pm +lib/App/Netdisco/Util/DeviceProperties.pm +lib/App/Netdisco/Util/Permissions.pm +lib/App/Netdisco/Util/Web.pm +lib/App/Netdisco/Web.pm +lib/App/Netdisco/Web/AuthN.pm +lib/App/Netdisco/Web/Device.pm +lib/App/Netdisco/Web/Inventory.pm +lib/App/Netdisco/Web/PortControl.pm +lib/App/Netdisco/Web/Search.pm +Makefile.PL +MANIFEST This list of files +META.yml +share/config.yml +share/environments/development.yml +share/environments/production.yml +share/public/500.html +share/public/css/bootstrap.min.css +share/public/css/font-awesome.css +share/public/css/nd_print.css +share/public/css/netdisco.css +share/public/css/toastr.css +share/public/dispatch.cgi +share/public/dispatch.fcgi +share/public/font/fontawesome-webfont.eot +share/public/font/fontawesome-webfont.svg +share/public/font/fontawesome-webfont.ttf +share/public/font/fontawesome-webfont.woff +share/public/images/crystalclear_mag.png +share/public/images/diagona_settings.png +share/public/images/dusseldorf_settings.png +share/public/images/glyphicons_072_bookmark.png +share/public/images/matte_basic_pin.png +share/public/images/splashyfish_left.png +share/public/images/splashyfish_right.png +share/public/images/tango_sweep.png +share/public/images/vaga_copy.png +share/public/javascripts/bootstrap.min.js +share/public/javascripts/d3.min.js +share/public/javascripts/jquery-deserialize.js +share/public/javascripts/jquery-history.js +share/public/javascripts/jquery-latest.min.js +share/public/javascripts/netdisco.js +share/public/javascripts/netdisco_portcontrol.js +share/public/javascripts/toastr.js +share/views/ajax/device/addresses.tt +share/views/ajax/device/details.tt +share/views/ajax/device/netmap.tt +share/views/ajax/device/ports.tt +share/views/ajax/search/device.tt +share/views/ajax/search/node_by_ip.tt +share/views/ajax/search/node_by_mac.tt +share/views/ajax/search/port.tt +share/views/ajax/search/vlan.tt +share/views/device.tt +share/views/index.tt +share/views/inventory.tt +share/views/js/common.js +share/views/js/device.js +share/views/js/search.js +share/views/layouts/main.tt +share/views/report.tt +share/views/search.tt +share/views/sidebar/device/ports.tt +share/views/sidebar/search/device.tt +share/views/sidebar/search/node.tt diff --git a/Netdisco/MANIFEST.SKIP b/Netdisco/MANIFEST.SKIP new file mode 100644 index 00000000..1039bb92 --- /dev/null +++ b/Netdisco/MANIFEST.SKIP @@ -0,0 +1,70 @@ + +\.bak$ +\.pid$ +\.swp$ + +^share/environments/(?!production|development) +test.pl +logs/.* +lib/auto/App/Netdisco + +^MANIFEST\. + +#!start included /home/oliver/perl-profiles/dancer/lib/perl5/ExtUtils/MANIFEST.SKIP +# Avoid version control files. +\bRCS\b +\bCVS\b +\bSCCS\b +,v$ +\B\.svn\b +\B\.git\b +\B\.gitignore\b +\b_darcs\b +\B\.cvsignore$ + +# Avoid VMS specific MakeMaker generated files +\bDescrip.MMS$ +\bDESCRIP.MMS$ +\bdescrip.mms$ + +# Avoid Makemaker generated and utility files. +\bMANIFEST\.bak +\bMakefile$ +\bblib/ +\bMakeMaker-\d +\bpm_to_blib\.ts$ +\bpm_to_blib$ +\bblibdirs\.ts$ # 6.18 through 6.25 generated this + +# Avoid Module::Build generated and utility files. +\bBuild$ +\b_build/ +\bBuild.bat$ +\bBuild.COM$ +\bBUILD.COM$ +\bbuild.com$ + +# Avoid temp and backup files. +~$ +\.old$ +\#$ +\b\.# +\.bak$ +\.tmp$ +\.# +\.rej$ + +# Avoid OS-specific files/dirs +# Mac OSX metadata +\B\.DS_Store +# Mac OSX SMB mount metadata files +\B\._ + +# Avoid Devel::Cover and Devel::CoverX::Covered files. +\bcover_db\b +\bcovered\b + +# Avoid MYMETA files +^MYMETA\. +#!end included /home/oliver/perl-profiles/dancer/lib/perl5/ExtUtils/MANIFEST.SKIP + diff --git a/Netdisco/Makefile.PL b/Netdisco/Makefile.PL new file mode 100644 index 00000000..216df402 --- /dev/null +++ b/Netdisco/Makefile.PL @@ -0,0 +1,44 @@ +use inc::Module::Install; + +name 'App-Netdisco'; +all_from 'lib/App/Netdisco.pm'; + +requires 'DBD::Pg' => 0; +requires 'DBD::SQLite' => 0; +requires 'DBIx::Class' => 0; +requires 'DBIx::Class::Helper::Row::SubClass' => 0; +requires 'Daemon::Generic' => 0; +requires 'Dancer' => 0; +requires 'Dancer::Plugin::DBIC' => 0; +requires 'File::ShareDir' => 0; +requires 'HTML::Entities' => 0; +requires 'HTTP::Tiny' => 0; +requires 'List::MoreUtils' => 0; +requires 'Net::MAC' => 0; +requires 'NetAddr::IP' => 0; +requires 'Path::Class' => 0; +requires 'Role::Tiny' => 0; +requires 'SNMP::Info' => 0; +requires 'SQL::Translator' => 0; +requires 'Socket6' => 0; +requires 'Template' => 0; +requires 'YAML' => 0; +requires 'namespace::clean' => 0; + +install_share 'share'; + +install_script 'bin/nd-dbic-versions'; +install_script 'bin/netdisco-daemon'; +install_script 'bin/netdisco-db-deploy'; +install_script 'bin/netdisco-web'; + +no_index directory => 'logs'; +no_index directory => 'lib/auto'; + +resources + homepage => 'http://netdisco.org/', + bugtracker => 'http://sourceforge.net/tracker/?group_id=80033&atid=558508', + repository => 'git://netdisco.git.sourceforge.net/gitroot/netdisco/netdisco-ng', + MailingList => 'https://lists.sourceforge.net/lists/listinfo/netdisco-users'; + +WriteAll; diff --git a/Netdisco/bin/config.yml b/Netdisco/bin/config.yml deleted file mode 120000 index 1555250d..00000000 --- a/Netdisco/bin/config.yml +++ /dev/null @@ -1 +0,0 @@ -../config.yml \ No newline at end of file diff --git a/Netdisco/bin/nd-dbic-versions b/Netdisco/bin/nd-dbic-versions index c87001cc..1ec2e84e 100755 --- a/Netdisco/bin/nd-dbic-versions +++ b/Netdisco/bin/nd-dbic-versions @@ -1,12 +1,13 @@ #!/usr/bin/env perl -use strict; -use warnings FATAL => 'all'; +use FindBin; +use lib "$FindBin::Bin/../lib"; +use App::Netdisco; use Dancer ':script'; use Dancer::Plugin::DBIC 'schema'; -use Netdisco::DB; +use App::Netdisco::DB; use Getopt::Long; =head1 nd-dbic-versions @@ -22,10 +23,7 @@ specification. =cut -schema('netdisco')->create_ddl_dir( - 'PostgreSQL', $version, $sql_dir, $preversion ); - -my $sql_dir = $Netdisco::DB::schema_versions_dir; +my $sql_dir = $App::Netdisco::DB::schema_versions_dir; my $version = schema('netdisco')->schema_version; my ( $preversion, $help ); @@ -49,3 +47,7 @@ $sql_dir ENDHELP exit(1); }; + +schema('netdisco')->create_ddl_dir( + 'PostgreSQL', $version, $sql_dir, $preversion ); + diff --git a/Netdisco/bin/netdisco-daemon b/Netdisco/bin/netdisco-daemon index e83ad06f..2c5a6cdf 100755 --- a/Netdisco/bin/netdisco-daemon +++ b/Netdisco/bin/netdisco-daemon @@ -1,5 +1,9 @@ #!/usr/bin/env perl +use FindBin; +use lib "$FindBin::Bin/../lib"; +use App::Netdisco; + use Dancer qw/:moose :script/; use Dancer::Plugin::DBIC 'schema'; @@ -61,7 +65,7 @@ sub gd_run_body { $pp->start(sub { print STDERR ">>> new $next_role worker starting...\n"; - with "Netdisco::Daemon::Worker::$next_role"; + with "App::Netdisco::Daemon::Worker::$next_role"; $gd->worker_begin if $gd->can('worker_begin'); $gd->worker_body; $gd->worker_end if $gd->can('worker_end'); diff --git a/Netdisco/bin/netdisco-db-deploy b/Netdisco/bin/netdisco-db-deploy index 1ee5b8e1..37308944 100755 --- a/Netdisco/bin/netdisco-db-deploy +++ b/Netdisco/bin/netdisco-db-deploy @@ -1,7 +1,8 @@ #!/usr/bin/env perl -use strict; -use warnings FATAL => 'all'; +use FindBin; +use lib "$FindBin::Bin/../lib"; +use App::Netdisco; use Dancer ':script'; use Dancer::Plugin::DBIC 'schema'; diff --git a/Netdisco/bin/netdisco-web b/Netdisco/bin/netdisco-web index bdb63acf..b001df42 100755 --- a/Netdisco/bin/netdisco-web +++ b/Netdisco/bin/netdisco-web @@ -1,5 +1,9 @@ #!/usr/bin/env perl +use FindBin; +use lib "$FindBin::Bin/../lib"; +use App::Netdisco; + use Dancer; -use Netdisco::Web; +use App::Netdisco::Web; dance; diff --git a/Netdisco/lib/App/Netdisco.pm b/Netdisco/lib/App/Netdisco.pm new file mode 100644 index 00000000..b64ea65d --- /dev/null +++ b/Netdisco/lib/App/Netdisco.pm @@ -0,0 +1,44 @@ +package App::Netdisco; + +use strict; +use warnings FATAL => 'all'; +use 5.10.0; + +use File::ShareDir 'module_dir'; +use Path::Class; + +our $VERSION = '2.00_009'; + +BEGIN { + if (not length $ENV{DANCER_APPDIR} + or not -f file($ENV{DANCER_APPDIR}, 'config.yml')) { + + my $auto = dir(File::ShareDir::module_dir('App::Netdisco'))->absolute; + + $ENV{DANCER_APPDIR} ||= $auto->stringify; + $ENV{DANCER_CONFDIR} ||= $auto->stringify; + + $ENV{DANCER_ENVDIR} ||= $auto->subdir('environments')->stringify; + $ENV{DANCER_PUBLIC} ||= $auto->subdir('public')->stringify; + $ENV{DANCER_VIEWS} ||= $auto->subdir('views')->stringify; + } +} + +=head1 App::Netdisco + +Netdisco is an Open Source web-based network management tool. + +=head1 AUTHOR + +Oliver Gorwits + +=head1 COPYRIGHT AND LICENSE + +This software is copyright (c) 2012 by The Netdisco Developer Team. + +This is free software; you can redistribute it and/or modify it under +the same terms as the Perl 5 programming language system itself. + +=cut + +1; diff --git a/Netdisco/lib/Netdisco/DB.pm b/Netdisco/lib/App/Netdisco/DB.pm similarity index 88% rename from Netdisco/lib/Netdisco/DB.pm rename to Netdisco/lib/App/Netdisco/DB.pm index 518ef5f2..a45d1837 100644 --- a/Netdisco/lib/Netdisco/DB.pm +++ b/Netdisco/lib/App/Netdisco/DB.pm @@ -1,5 +1,5 @@ use utf8; -package Netdisco::DB; +package App::Netdisco::DB; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE @@ -20,7 +20,7 @@ our $VERSION = 3; # schema version used for upgrades, keep as integer use Path::Class; use File::Basename; -my (undef, $libpath, undef) = fileparse( $INC{ 'Netdisco/DB.pm' } ); +my (undef, $libpath, undef) = fileparse( $INC{ 'App/Netdisco/DB.pm' } ); our $schema_versions_dir = Path::Class::Dir->new($libpath) ->subdir("DB", "schema_versions")->stringify; diff --git a/Netdisco/lib/Netdisco/DB/Result/Admin.pm b/Netdisco/lib/App/Netdisco/DB/Result/Admin.pm similarity index 97% rename from Netdisco/lib/Netdisco/DB/Result/Admin.pm rename to Netdisco/lib/App/Netdisco/DB/Result/Admin.pm index 46390a87..fb98b3fa 100644 --- a/Netdisco/lib/Netdisco/DB/Result/Admin.pm +++ b/Netdisco/lib/App/Netdisco/DB/Result/Admin.pm @@ -1,5 +1,5 @@ use utf8; -package Netdisco::DB::Result::Admin; +package App::Netdisco::DB::Result::Admin; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE diff --git a/Netdisco/lib/Netdisco/DB/Result/Device.pm b/Netdisco/lib/App/Netdisco/DB/Result/Device.pm similarity index 92% rename from Netdisco/lib/Netdisco/DB/Result/Device.pm rename to Netdisco/lib/App/Netdisco/DB/Result/Device.pm index 19185daa..3fd16244 100644 --- a/Netdisco/lib/Netdisco/DB/Result/Device.pm +++ b/Netdisco/lib/App/Netdisco/DB/Result/Device.pm @@ -1,5 +1,5 @@ use utf8; -package Netdisco::DB::Result::Device; +package App::Netdisco::DB::Result::Device; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE @@ -91,7 +91,7 @@ all the interface IP aliases configured on the Device. =cut -__PACKAGE__->has_many( device_ips => 'Netdisco::DB::Result::DeviceIp', 'ip' ); +__PACKAGE__->has_many( device_ips => 'App::Netdisco::DB::Result::DeviceIp', 'ip' ); =head2 vlans @@ -100,7 +100,7 @@ configured on or known by this Device. =cut -__PACKAGE__->has_many( vlans => 'Netdisco::DB::Result::DeviceVlan', 'ip' ); +__PACKAGE__->has_many( vlans => 'App::Netdisco::DB::Result::DeviceVlan', 'ip' ); =head2 ports @@ -108,7 +108,7 @@ Returns the set of ports on this Device. =cut -__PACKAGE__->has_many( ports => 'Netdisco::DB::Result::DevicePort', 'ip' ); +__PACKAGE__->has_many( ports => 'App::Netdisco::DB::Result::DevicePort', 'ip' ); =head2 port_vlans @@ -121,7 +121,7 @@ only on Ports on this Device. =cut __PACKAGE__->has_many( - port_vlans => 'Netdisco::DB::Result::DevicePortVlan', + port_vlans => 'App::Netdisco::DB::Result::DevicePortVlan', 'ip', { join_type => 'RIGHT' } ); diff --git a/Netdisco/lib/Netdisco/DB/Result/DeviceIp.pm b/Netdisco/lib/App/Netdisco/DB/Result/DeviceIp.pm similarity index 85% rename from Netdisco/lib/Netdisco/DB/Result/DeviceIp.pm rename to Netdisco/lib/App/Netdisco/DB/Result/DeviceIp.pm index ee2a6ba7..c850fdf6 100644 --- a/Netdisco/lib/Netdisco/DB/Result/DeviceIp.pm +++ b/Netdisco/lib/App/Netdisco/DB/Result/DeviceIp.pm @@ -1,5 +1,5 @@ use utf8; -package Netdisco::DB::Result::DeviceIp; +package App::Netdisco::DB::Result::DeviceIp; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE @@ -42,7 +42,7 @@ Returns the entry from the C table to which this IP alias relates. =cut -__PACKAGE__->belongs_to( device => 'Netdisco::DB::Result::Device', 'ip' ); +__PACKAGE__->belongs_to( device => 'App::Netdisco::DB::Result::Device', 'ip' ); =head2 device_port @@ -53,7 +53,7 @@ routed port or virtual interface). __PACKAGE__->add_unique_constraint(['alias']); -__PACKAGE__->belongs_to( device_port => 'Netdisco::DB::Result::DevicePort', +__PACKAGE__->belongs_to( device_port => 'App::Netdisco::DB::Result::DevicePort', { 'foreign.port' => 'self.port', 'foreign.ip' => 'self.ip' } ); 1; diff --git a/Netdisco/lib/Netdisco/DB/Result/DeviceModule.pm b/Netdisco/lib/App/Netdisco/DB/Result/DeviceModule.pm similarity index 96% rename from Netdisco/lib/Netdisco/DB/Result/DeviceModule.pm rename to Netdisco/lib/App/Netdisco/DB/Result/DeviceModule.pm index 6fdbdea2..f9ccc2fb 100644 --- a/Netdisco/lib/Netdisco/DB/Result/DeviceModule.pm +++ b/Netdisco/lib/App/Netdisco/DB/Result/DeviceModule.pm @@ -1,5 +1,5 @@ use utf8; -package Netdisco::DB::Result::DeviceModule; +package App::Netdisco::DB::Result::DeviceModule; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE diff --git a/Netdisco/lib/Netdisco/DB/Result/DevicePort.pm b/Netdisco/lib/App/Netdisco/DB/Result/DevicePort.pm similarity index 87% rename from Netdisco/lib/Netdisco/DB/Result/DevicePort.pm rename to Netdisco/lib/App/Netdisco/DB/Result/DevicePort.pm index 7356c4b0..f718edf6 100644 --- a/Netdisco/lib/Netdisco/DB/Result/DevicePort.pm +++ b/Netdisco/lib/App/Netdisco/DB/Result/DevicePort.pm @@ -1,5 +1,5 @@ use utf8; -package Netdisco::DB::Result::DevicePort; +package App::Netdisco::DB::Result::DevicePort; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE @@ -72,7 +72,7 @@ Returns the Device table entry to which the given Port is related. =cut -__PACKAGE__->belongs_to( device => 'Netdisco::DB::Result::Device', 'ip'); +__PACKAGE__->belongs_to( device => 'App::Netdisco::DB::Result::Device', 'ip'); =head2 nodes / active_nodes / nodes_with_age / active_nodes_with_age @@ -88,7 +88,7 @@ days/weeks/months/years". =cut -__PACKAGE__->has_many( nodes => 'Netdisco::DB::Result::Node', +__PACKAGE__->has_many( nodes => 'App::Netdisco::DB::Result::Node', { 'foreign.switch' => 'self.ip', 'foreign.port' => 'self.port', @@ -96,7 +96,7 @@ __PACKAGE__->has_many( nodes => 'Netdisco::DB::Result::Node', { join_type => 'LEFT' }, ); -__PACKAGE__->has_many( nodes_with_age => 'Netdisco::DB::Result::Virtual::NodeWithAge', +__PACKAGE__->has_many( nodes_with_age => 'App::Netdisco::DB::Result::Virtual::NodeWithAge', { 'foreign.switch' => 'self.ip', 'foreign.port' => 'self.port', @@ -104,7 +104,7 @@ __PACKAGE__->has_many( nodes_with_age => 'Netdisco::DB::Result::Virtual::NodeWit { join_type => 'LEFT' }, ); -__PACKAGE__->has_many( active_nodes => 'Netdisco::DB::Result::Virtual::ActiveNode', +__PACKAGE__->has_many( active_nodes => 'App::Netdisco::DB::Result::Virtual::ActiveNode', { 'foreign.switch' => 'self.ip', 'foreign.port' => 'self.port', @@ -112,7 +112,7 @@ __PACKAGE__->has_many( active_nodes => 'Netdisco::DB::Result::Virtual::ActiveNod { join_type => 'LEFT' }, ); -__PACKAGE__->has_many( active_nodes_with_age => 'Netdisco::DB::Result::Virtual::ActiveNodeWithAge', +__PACKAGE__->has_many( active_nodes_with_age => 'App::Netdisco::DB::Result::Virtual::ActiveNodeWithAge', { 'foreign.switch' => 'self.ip', 'foreign.port' => 'self.port', @@ -132,7 +132,7 @@ database. =cut -__PACKAGE__->belongs_to( neighbor_alias => 'Netdisco::DB::Result::DeviceIp', +__PACKAGE__->belongs_to( neighbor_alias => 'App::Netdisco::DB::Result::DeviceIp', { 'foreign.alias' => 'self.remote_ip' }, { join_type => 'LEFT' }, ); @@ -144,7 +144,7 @@ device port. =cut -__PACKAGE__->might_have( power => 'Netdisco::DB::Result::DevicePortPower', { +__PACKAGE__->might_have( power => 'App::Netdisco::DB::Result::DevicePortPower', { 'foreign.ip' => 'self.ip', 'foreign.port' => 'self.port', }); @@ -155,7 +155,7 @@ port, where the VLANs are all tagged. =cut -__PACKAGE__->has_many( port_vlans_tagged => 'Netdisco::DB::Result::Virtual::DevicePortVlanTagged', +__PACKAGE__->has_many( port_vlans_tagged => 'App::Netdisco::DB::Result::Virtual::DevicePortVlanTagged', { 'foreign.ip' => 'self.ip', 'foreign.port' => 'self.port', @@ -185,7 +185,7 @@ The JOIN is of type LEFT, in case the OUI table has not been populated. =cut -__PACKAGE__->belongs_to( oui => 'Netdisco::DB::Result::Oui', +__PACKAGE__->belongs_to( oui => 'App::Netdisco::DB::Result::Oui', sub { my $args = shift; return { diff --git a/Netdisco/lib/Netdisco/DB/Result/DevicePortLog.pm b/Netdisco/lib/App/Netdisco/DB/Result/DevicePortLog.pm similarity index 95% rename from Netdisco/lib/Netdisco/DB/Result/DevicePortLog.pm rename to Netdisco/lib/App/Netdisco/DB/Result/DevicePortLog.pm index 6439f34d..a764902a 100644 --- a/Netdisco/lib/Netdisco/DB/Result/DevicePortLog.pm +++ b/Netdisco/lib/App/Netdisco/DB/Result/DevicePortLog.pm @@ -1,5 +1,5 @@ use utf8; -package Netdisco::DB::Result::DevicePortLog; +package App::Netdisco::DB::Result::DevicePortLog; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE diff --git a/Netdisco/lib/Netdisco/DB/Result/DevicePortPower.pm b/Netdisco/lib/App/Netdisco/DB/Result/DevicePortPower.pm similarity index 88% rename from Netdisco/lib/Netdisco/DB/Result/DevicePortPower.pm rename to Netdisco/lib/App/Netdisco/DB/Result/DevicePortPower.pm index 7cad712f..4798f9ca 100644 --- a/Netdisco/lib/Netdisco/DB/Result/DevicePortPower.pm +++ b/Netdisco/lib/App/Netdisco/DB/Result/DevicePortPower.pm @@ -1,5 +1,5 @@ use utf8; -package Netdisco::DB::Result::DevicePortPower; +package App::Netdisco::DB::Result::DevicePortPower; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE @@ -39,7 +39,7 @@ Returns the entry from the C table for which this Power entry applies. =cut -__PACKAGE__->belongs_to( port => 'Netdisco::DB::Result::DevicePort', { +__PACKAGE__->belongs_to( port => 'App::Netdisco::DB::Result::DevicePort', { 'foreign.ip' => 'self.ip', 'foreign.port' => 'self.port', }); diff --git a/Netdisco/lib/Netdisco/DB/Result/DevicePortSsid.pm b/Netdisco/lib/App/Netdisco/DB/Result/DevicePortSsid.pm similarity index 93% rename from Netdisco/lib/Netdisco/DB/Result/DevicePortSsid.pm rename to Netdisco/lib/App/Netdisco/DB/Result/DevicePortSsid.pm index 46acf3e1..b3c3d9b2 100644 --- a/Netdisco/lib/Netdisco/DB/Result/DevicePortSsid.pm +++ b/Netdisco/lib/App/Netdisco/DB/Result/DevicePortSsid.pm @@ -1,5 +1,5 @@ use utf8; -package Netdisco::DB::Result::DevicePortSsid; +package App::Netdisco::DB::Result::DevicePortSsid; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE diff --git a/Netdisco/lib/Netdisco/DB/Result/DevicePortVlan.pm b/Netdisco/lib/App/Netdisco/DB/Result/DevicePortVlan.pm similarity index 85% rename from Netdisco/lib/Netdisco/DB/Result/DevicePortVlan.pm rename to Netdisco/lib/App/Netdisco/DB/Result/DevicePortVlan.pm index 2b262e61..684e4acd 100644 --- a/Netdisco/lib/Netdisco/DB/Result/DevicePortVlan.pm +++ b/Netdisco/lib/App/Netdisco/DB/Result/DevicePortVlan.pm @@ -1,5 +1,5 @@ use utf8; -package Netdisco::DB::Result::DevicePortVlan; +package App::Netdisco::DB::Result::DevicePortVlan; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE @@ -50,7 +50,7 @@ VLAN is configured. =cut -__PACKAGE__->belongs_to( device => 'Netdisco::DB::Result::Device', 'ip' ); +__PACKAGE__->belongs_to( device => 'App::Netdisco::DB::Result::Device', 'ip' ); =head2 port @@ -58,7 +58,7 @@ Returns the entry from the C table on which this VLAN is configured. =cut -__PACKAGE__->belongs_to( port => 'Netdisco::DB::Result::DevicePort', { +__PACKAGE__->belongs_to( port => 'App::Netdisco::DB::Result::DevicePort', { 'foreign.ip' => 'self.ip', 'foreign.port' => 'self.port', }); @@ -69,7 +69,7 @@ detail, typically in order that the C can be retrieved. =cut -__PACKAGE__->belongs_to( vlan => 'Netdisco::DB::Result::DeviceVlan', { +__PACKAGE__->belongs_to( vlan => 'App::Netdisco::DB::Result::DeviceVlan', { 'foreign.ip' => 'self.ip', 'foreign.vlan' => 'self.vlan', }); diff --git a/Netdisco/lib/Netdisco/DB/Result/DevicePortWireless.pm b/Netdisco/lib/App/Netdisco/DB/Result/DevicePortWireless.pm similarity index 92% rename from Netdisco/lib/Netdisco/DB/Result/DevicePortWireless.pm rename to Netdisco/lib/App/Netdisco/DB/Result/DevicePortWireless.pm index f653c08e..6c7a6633 100644 --- a/Netdisco/lib/Netdisco/DB/Result/DevicePortWireless.pm +++ b/Netdisco/lib/App/Netdisco/DB/Result/DevicePortWireless.pm @@ -1,5 +1,5 @@ use utf8; -package Netdisco::DB::Result::DevicePortWireless; +package App::Netdisco::DB::Result::DevicePortWireless; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE diff --git a/Netdisco/lib/Netdisco/DB/Result/DevicePower.pm b/Netdisco/lib/App/Netdisco/DB/Result/DevicePower.pm similarity index 93% rename from Netdisco/lib/Netdisco/DB/Result/DevicePower.pm rename to Netdisco/lib/App/Netdisco/DB/Result/DevicePower.pm index 02164695..1a70858c 100644 --- a/Netdisco/lib/Netdisco/DB/Result/DevicePower.pm +++ b/Netdisco/lib/App/Netdisco/DB/Result/DevicePower.pm @@ -1,5 +1,5 @@ use utf8; -package Netdisco::DB::Result::DevicePower; +package App::Netdisco::DB::Result::DevicePower; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE diff --git a/Netdisco/lib/Netdisco/DB/Result/DeviceRoute.pm b/Netdisco/lib/App/Netdisco/DB/Result/DeviceRoute.pm similarity index 95% rename from Netdisco/lib/Netdisco/DB/Result/DeviceRoute.pm rename to Netdisco/lib/App/Netdisco/DB/Result/DeviceRoute.pm index d129a751..31e62457 100644 --- a/Netdisco/lib/Netdisco/DB/Result/DeviceRoute.pm +++ b/Netdisco/lib/App/Netdisco/DB/Result/DeviceRoute.pm @@ -1,5 +1,5 @@ use utf8; -package Netdisco::DB::Result::DeviceRoute; +package App::Netdisco::DB::Result::DeviceRoute; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE diff --git a/Netdisco/lib/Netdisco/DB/Result/DeviceVlan.pm b/Netdisco/lib/App/Netdisco/DB/Result/DeviceVlan.pm similarity index 84% rename from Netdisco/lib/Netdisco/DB/Result/DeviceVlan.pm rename to Netdisco/lib/App/Netdisco/DB/Result/DeviceVlan.pm index 55f4f3ab..7cb141f9 100644 --- a/Netdisco/lib/Netdisco/DB/Result/DeviceVlan.pm +++ b/Netdisco/lib/App/Netdisco/DB/Result/DeviceVlan.pm @@ -1,5 +1,5 @@ use utf8; -package Netdisco::DB::Result::DeviceVlan; +package App::Netdisco::DB::Result::DeviceVlan; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE @@ -45,7 +45,7 @@ Returns the entry from the C table on which this VLAN entry was discover =cut -__PACKAGE__->belongs_to( device => 'Netdisco::DB::Result::Device', 'ip' ); +__PACKAGE__->belongs_to( device => 'App::Netdisco::DB::Result::Device', 'ip' ); =head2 port_vlans_tagged @@ -53,7 +53,7 @@ Link relationship for C, see below. =cut -__PACKAGE__->has_many( port_vlans_tagged => 'Netdisco::DB::Result::Virtual::DevicePortVlanTagged', +__PACKAGE__->has_many( port_vlans_tagged => 'App::Netdisco::DB::Result::Virtual::DevicePortVlanTagged', { 'foreign.ip' => 'self.ip', 'foreign.vlan' => 'self.vlan' }, ); @@ -63,7 +63,7 @@ Link relationship to support C, see below. =cut -__PACKAGE__->has_many( port_vlans_native => 'Netdisco::DB::Result::Virtual::DevicePortVlanNative', +__PACKAGE__->has_many( port_vlans_native => 'App::Netdisco::DB::Result::Virtual::DevicePortVlanNative', { 'foreign.ip' => 'self.ip', 'foreign.vlan' => 'self.vlan' }, ); diff --git a/Netdisco/lib/Netdisco/DB/Result/Log.pm b/Netdisco/lib/App/Netdisco/DB/Result/Log.pm similarity index 95% rename from Netdisco/lib/Netdisco/DB/Result/Log.pm rename to Netdisco/lib/App/Netdisco/DB/Result/Log.pm index acd56c99..e549b0df 100644 --- a/Netdisco/lib/Netdisco/DB/Result/Log.pm +++ b/Netdisco/lib/App/Netdisco/DB/Result/Log.pm @@ -1,5 +1,5 @@ use utf8; -package Netdisco::DB::Result::Log; +package App::Netdisco::DB::Result::Log; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE diff --git a/Netdisco/lib/Netdisco/DB/Result/Node.pm b/Netdisco/lib/App/Netdisco/DB/Result/Node.pm similarity index 90% rename from Netdisco/lib/Netdisco/DB/Result/Node.pm rename to Netdisco/lib/App/Netdisco/DB/Result/Node.pm index 4c7bae03..6336cf13 100644 --- a/Netdisco/lib/Netdisco/DB/Result/Node.pm +++ b/Netdisco/lib/App/Netdisco/DB/Result/Node.pm @@ -1,5 +1,5 @@ use utf8; -package Netdisco::DB::Result::Node; +package App::Netdisco::DB::Result::Node; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE @@ -60,7 +60,7 @@ database but the relation is being used in C. =cut -__PACKAGE__->belongs_to( device => 'Netdisco::DB::Result::Device', +__PACKAGE__->belongs_to( device => 'App::Netdisco::DB::Result::Device', { 'foreign.ip' => 'self.switch' }, { join_type => 'LEFT' } ); =head2 device_port @@ -74,7 +74,7 @@ database but the relation is being used in C. =cut # device port may have been deleted (reconfigured modules?) but node remains -__PACKAGE__->belongs_to( device_port => 'Netdisco::DB::Result::DevicePort', +__PACKAGE__->belongs_to( device_port => 'App::Netdisco::DB::Result::DevicePort', { 'foreign.ip' => 'self.switch', 'foreign.port' => 'self.port' }, { join_type => 'LEFT' } ); @@ -89,7 +89,7 @@ the current Node's. =cut -__PACKAGE__->has_many( ips => 'Netdisco::DB::Result::NodeIp', +__PACKAGE__->has_many( ips => 'App::Netdisco::DB::Result::NodeIp', { 'foreign.mac' => 'self.mac', 'foreign.active' => 'self.active' } ); =head2 oui @@ -101,7 +101,7 @@ The JOIN is of type LEFT, in case the OUI table has not been populated. =cut -__PACKAGE__->belongs_to( oui => 'Netdisco::DB::Result::Oui', 'oui', +__PACKAGE__->belongs_to( oui => 'App::Netdisco::DB::Result::Oui', 'oui', { join_type => 'LEFT' } ); =head1 ADDITIONAL COLUMNS diff --git a/Netdisco/lib/Netdisco/DB/Result/NodeIp.pm b/Netdisco/lib/App/Netdisco/DB/Result/NodeIp.pm similarity index 95% rename from Netdisco/lib/Netdisco/DB/Result/NodeIp.pm rename to Netdisco/lib/App/Netdisco/DB/Result/NodeIp.pm index 1a2faf9e..6711fbd9 100644 --- a/Netdisco/lib/Netdisco/DB/Result/NodeIp.pm +++ b/Netdisco/lib/App/Netdisco/DB/Result/NodeIp.pm @@ -1,5 +1,5 @@ use utf8; -package Netdisco::DB::Result::NodeIp; +package App::Netdisco::DB::Result::NodeIp; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE @@ -50,7 +50,7 @@ The JOIN is of type LEFT, in case the OUI table has not been populated. =cut -__PACKAGE__->belongs_to( oui => 'Netdisco::DB::Result::Oui', +__PACKAGE__->belongs_to( oui => 'App::Netdisco::DB::Result::Oui', sub { my $args = shift; return { @@ -77,7 +77,7 @@ include independent C fields. =cut -__PACKAGE__->has_many( node_ips => 'Netdisco::DB::Result::NodeIp', +__PACKAGE__->has_many( node_ips => 'App::Netdisco::DB::Result::NodeIp', { 'foreign.mac' => 'self.mac' } ); =head2 nodes @@ -93,7 +93,7 @@ See also the C helper routine, below. =cut -__PACKAGE__->has_many( nodes => 'Netdisco::DB::Result::Node', +__PACKAGE__->has_many( nodes => 'App::Netdisco::DB::Result::Node', { 'foreign.mac' => 'self.mac' } ); my $search_attr = { diff --git a/Netdisco/lib/Netdisco/DB/Result/NodeMonitor.pm b/Netdisco/lib/App/Netdisco/DB/Result/NodeMonitor.pm similarity index 94% rename from Netdisco/lib/Netdisco/DB/Result/NodeMonitor.pm rename to Netdisco/lib/App/Netdisco/DB/Result/NodeMonitor.pm index ea758667..87b5d36f 100644 --- a/Netdisco/lib/Netdisco/DB/Result/NodeMonitor.pm +++ b/Netdisco/lib/App/Netdisco/DB/Result/NodeMonitor.pm @@ -1,5 +1,5 @@ use utf8; -package Netdisco::DB::Result::NodeMonitor; +package App::Netdisco::DB::Result::NodeMonitor; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE diff --git a/Netdisco/lib/Netdisco/DB/Result/NodeNbt.pm b/Netdisco/lib/App/Netdisco/DB/Result/NodeNbt.pm similarity index 96% rename from Netdisco/lib/Netdisco/DB/Result/NodeNbt.pm rename to Netdisco/lib/App/Netdisco/DB/Result/NodeNbt.pm index a1fd8e46..fdde2e15 100644 --- a/Netdisco/lib/Netdisco/DB/Result/NodeNbt.pm +++ b/Netdisco/lib/App/Netdisco/DB/Result/NodeNbt.pm @@ -1,5 +1,5 @@ use utf8; -package Netdisco::DB::Result::NodeNbt; +package App::Netdisco::DB::Result::NodeNbt; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE diff --git a/Netdisco/lib/Netdisco/DB/Result/NodeWireless.pm b/Netdisco/lib/App/Netdisco/DB/Result/NodeWireless.pm similarity index 96% rename from Netdisco/lib/Netdisco/DB/Result/NodeWireless.pm rename to Netdisco/lib/App/Netdisco/DB/Result/NodeWireless.pm index 3deb714b..50314b7d 100644 --- a/Netdisco/lib/Netdisco/DB/Result/NodeWireless.pm +++ b/Netdisco/lib/App/Netdisco/DB/Result/NodeWireless.pm @@ -1,5 +1,5 @@ use utf8; -package Netdisco::DB::Result::NodeWireless; +package App::Netdisco::DB::Result::NodeWireless; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE diff --git a/Netdisco/lib/Netdisco/DB/Result/Oui.pm b/Netdisco/lib/App/Netdisco/DB/Result/Oui.pm similarity index 93% rename from Netdisco/lib/Netdisco/DB/Result/Oui.pm rename to Netdisco/lib/App/Netdisco/DB/Result/Oui.pm index b973f412..059f99f7 100644 --- a/Netdisco/lib/Netdisco/DB/Result/Oui.pm +++ b/Netdisco/lib/App/Netdisco/DB/Result/Oui.pm @@ -1,5 +1,5 @@ use utf8; -package Netdisco::DB::Result::Oui; +package App::Netdisco::DB::Result::Oui; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE diff --git a/Netdisco/lib/Netdisco/DB/Result/Process.pm b/Netdisco/lib/App/Netdisco/DB/Result/Process.pm similarity index 95% rename from Netdisco/lib/Netdisco/DB/Result/Process.pm rename to Netdisco/lib/App/Netdisco/DB/Result/Process.pm index 40af173c..3910d6f9 100644 --- a/Netdisco/lib/Netdisco/DB/Result/Process.pm +++ b/Netdisco/lib/App/Netdisco/DB/Result/Process.pm @@ -1,5 +1,5 @@ use utf8; -package Netdisco::DB::Result::Process; +package App::Netdisco::DB::Result::Process; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE diff --git a/Netdisco/lib/Netdisco/DB/Result/Session.pm b/Netdisco/lib/App/Netdisco/DB/Result/Session.pm similarity index 94% rename from Netdisco/lib/Netdisco/DB/Result/Session.pm rename to Netdisco/lib/App/Netdisco/DB/Result/Session.pm index 0356cf44..eedbc01e 100644 --- a/Netdisco/lib/Netdisco/DB/Result/Session.pm +++ b/Netdisco/lib/App/Netdisco/DB/Result/Session.pm @@ -1,5 +1,5 @@ use utf8; -package Netdisco::DB::Result::Session; +package App::Netdisco::DB::Result::Session; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE diff --git a/Netdisco/lib/Netdisco/DB/Result/Subnet.pm b/Netdisco/lib/App/Netdisco/DB/Result/Subnet.pm similarity index 95% rename from Netdisco/lib/Netdisco/DB/Result/Subnet.pm rename to Netdisco/lib/App/Netdisco/DB/Result/Subnet.pm index 494bb3ed..f6764099 100644 --- a/Netdisco/lib/Netdisco/DB/Result/Subnet.pm +++ b/Netdisco/lib/App/Netdisco/DB/Result/Subnet.pm @@ -1,5 +1,5 @@ use utf8; -package Netdisco::DB::Result::Subnet; +package App::Netdisco::DB::Result::Subnet; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE diff --git a/Netdisco/lib/Netdisco/DB/Result/Topology.pm b/Netdisco/lib/App/Netdisco/DB/Result/Topology.pm similarity index 88% rename from Netdisco/lib/Netdisco/DB/Result/Topology.pm rename to Netdisco/lib/App/Netdisco/DB/Result/Topology.pm index b0b953a4..8a4a8746 100644 --- a/Netdisco/lib/Netdisco/DB/Result/Topology.pm +++ b/Netdisco/lib/App/Netdisco/DB/Result/Topology.pm @@ -1,5 +1,5 @@ use utf8; -package Netdisco::DB::Result::Topology; +package App::Netdisco::DB::Result::Topology; use strict; use warnings; diff --git a/Netdisco/lib/Netdisco/DB/Result/User.pm b/Netdisco/lib/App/Netdisco/DB/Result/User.pm similarity index 96% rename from Netdisco/lib/Netdisco/DB/Result/User.pm rename to Netdisco/lib/App/Netdisco/DB/Result/User.pm index 213fd8ba..8aec3792 100644 --- a/Netdisco/lib/Netdisco/DB/Result/User.pm +++ b/Netdisco/lib/App/Netdisco/DB/Result/User.pm @@ -1,5 +1,5 @@ use utf8; -package Netdisco::DB::Result::User; +package App::Netdisco::DB::Result::User; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE diff --git a/Netdisco/lib/Netdisco/DB/Result/UserLog.pm b/Netdisco/lib/App/Netdisco/DB/Result/UserLog.pm similarity index 95% rename from Netdisco/lib/Netdisco/DB/Result/UserLog.pm rename to Netdisco/lib/App/Netdisco/DB/Result/UserLog.pm index 9f13a4ad..6169aaa5 100644 --- a/Netdisco/lib/Netdisco/DB/Result/UserLog.pm +++ b/Netdisco/lib/App/Netdisco/DB/Result/UserLog.pm @@ -1,5 +1,5 @@ use utf8; -package Netdisco::DB::Result::UserLog; +package App::Netdisco::DB::Result::UserLog; # Created by DBIx::Class::Schema::Loader # DO NOT MODIFY THE FIRST PART OF THIS FILE diff --git a/Netdisco/lib/Netdisco/DB/Result/Virtual/ActiveNode.pm b/Netdisco/lib/App/Netdisco/DB/Result/Virtual/ActiveNode.pm similarity index 78% rename from Netdisco/lib/Netdisco/DB/Result/Virtual/ActiveNode.pm rename to Netdisco/lib/App/Netdisco/DB/Result/Virtual/ActiveNode.pm index 3ff0b141..69a964d3 100644 --- a/Netdisco/lib/Netdisco/DB/Result/Virtual/ActiveNode.pm +++ b/Netdisco/lib/App/Netdisco/DB/Result/Virtual/ActiveNode.pm @@ -1,10 +1,10 @@ use utf8; -package Netdisco::DB::Result::Virtual::ActiveNode; +package App::Netdisco::DB::Result::Virtual::ActiveNode; use strict; use warnings; -use base 'Netdisco::DB::Result::Node'; +use base 'App::Netdisco::DB::Result::Node'; __PACKAGE__->load_components('Helper::Row::SubClass'); __PACKAGE__->subclass; diff --git a/Netdisco/lib/Netdisco/DB/Result/Virtual/ActiveNodeWithAge.pm b/Netdisco/lib/App/Netdisco/DB/Result/Virtual/ActiveNodeWithAge.pm similarity index 82% rename from Netdisco/lib/Netdisco/DB/Result/Virtual/ActiveNodeWithAge.pm rename to Netdisco/lib/App/Netdisco/DB/Result/Virtual/ActiveNodeWithAge.pm index 38b9f66a..8f9cedfb 100644 --- a/Netdisco/lib/Netdisco/DB/Result/Virtual/ActiveNodeWithAge.pm +++ b/Netdisco/lib/App/Netdisco/DB/Result/Virtual/ActiveNodeWithAge.pm @@ -1,10 +1,10 @@ use utf8; -package Netdisco::DB::Result::Virtual::ActiveNodeWithAge; +package App::Netdisco::DB::Result::Virtual::ActiveNodeWithAge; use strict; use warnings; -use base 'Netdisco::DB::Result::Virtual::ActiveNode'; +use base 'App::Netdisco::DB::Result::Virtual::ActiveNode'; __PACKAGE__->load_components('Helper::Row::SubClass'); __PACKAGE__->subclass; diff --git a/Netdisco/lib/Netdisco/DB/Result/Virtual/DeviceLinks.pm b/Netdisco/lib/App/Netdisco/DB/Result/Virtual/DeviceLinks.pm similarity index 93% rename from Netdisco/lib/Netdisco/DB/Result/Virtual/DeviceLinks.pm rename to Netdisco/lib/App/Netdisco/DB/Result/Virtual/DeviceLinks.pm index a91d393b..c2f58ea2 100644 --- a/Netdisco/lib/Netdisco/DB/Result/Virtual/DeviceLinks.pm +++ b/Netdisco/lib/App/Netdisco/DB/Result/Virtual/DeviceLinks.pm @@ -1,4 +1,4 @@ -package Netdisco::DB::Result::Virtual::DeviceLinks; +package App::Netdisco::DB::Result::Virtual::DeviceLinks; use strict; use warnings; diff --git a/Netdisco/lib/Netdisco/DB/Result/Virtual/DevicePortVlanNative.pm b/Netdisco/lib/App/Netdisco/DB/Result/Virtual/DevicePortVlanNative.pm similarity index 76% rename from Netdisco/lib/Netdisco/DB/Result/Virtual/DevicePortVlanNative.pm rename to Netdisco/lib/App/Netdisco/DB/Result/Virtual/DevicePortVlanNative.pm index 0b11fc5f..d2930465 100644 --- a/Netdisco/lib/Netdisco/DB/Result/Virtual/DevicePortVlanNative.pm +++ b/Netdisco/lib/App/Netdisco/DB/Result/Virtual/DevicePortVlanNative.pm @@ -1,10 +1,10 @@ use utf8; -package Netdisco::DB::Result::Virtual::DevicePortVlanNative; +package App::Netdisco::DB::Result::Virtual::DevicePortVlanNative; use strict; use warnings; -use base 'Netdisco::DB::Result::DevicePortVlan'; +use base 'App::Netdisco::DB::Result::DevicePortVlan'; __PACKAGE__->load_components('Helper::Row::SubClass'); __PACKAGE__->subclass; diff --git a/Netdisco/lib/Netdisco/DB/Result/Virtual/DevicePortVlanTagged.pm b/Netdisco/lib/App/Netdisco/DB/Result/Virtual/DevicePortVlanTagged.pm similarity index 76% rename from Netdisco/lib/Netdisco/DB/Result/Virtual/DevicePortVlanTagged.pm rename to Netdisco/lib/App/Netdisco/DB/Result/Virtual/DevicePortVlanTagged.pm index 4fe7c757..0cdfa1a9 100644 --- a/Netdisco/lib/Netdisco/DB/Result/Virtual/DevicePortVlanTagged.pm +++ b/Netdisco/lib/App/Netdisco/DB/Result/Virtual/DevicePortVlanTagged.pm @@ -1,10 +1,10 @@ use utf8; -package Netdisco::DB::Result::Virtual::DevicePortVlanTagged; +package App::Netdisco::DB::Result::Virtual::DevicePortVlanTagged; use strict; use warnings; -use base 'Netdisco::DB::Result::DevicePortVlan'; +use base 'App::Netdisco::DB::Result::DevicePortVlan'; __PACKAGE__->load_components('Helper::Row::SubClass'); __PACKAGE__->subclass; diff --git a/Netdisco/lib/Netdisco/DB/Result/Virtual/NodeWithAge.pm b/Netdisco/lib/App/Netdisco/DB/Result/Virtual/NodeWithAge.pm similarity index 85% rename from Netdisco/lib/Netdisco/DB/Result/Virtual/NodeWithAge.pm rename to Netdisco/lib/App/Netdisco/DB/Result/Virtual/NodeWithAge.pm index 7d086ccc..6679f0f2 100644 --- a/Netdisco/lib/Netdisco/DB/Result/Virtual/NodeWithAge.pm +++ b/Netdisco/lib/App/Netdisco/DB/Result/Virtual/NodeWithAge.pm @@ -1,10 +1,10 @@ use utf8; -package Netdisco::DB::Result::Virtual::NodeWithAge; +package App::Netdisco::DB::Result::Virtual::NodeWithAge; use strict; use warnings; -use base 'Netdisco::DB::Result::Node'; +use base 'App::Netdisco::DB::Result::Node'; __PACKAGE__->load_components('Helper::Row::SubClass'); __PACKAGE__->subclass; diff --git a/Netdisco/lib/Netdisco/DB/ResultSet/Device.pm b/Netdisco/lib/App/Netdisco/DB/ResultSet/Device.pm similarity index 99% rename from Netdisco/lib/Netdisco/DB/ResultSet/Device.pm rename to Netdisco/lib/App/Netdisco/DB/ResultSet/Device.pm index 79884d83..e0716cec 100644 --- a/Netdisco/lib/Netdisco/DB/ResultSet/Device.pm +++ b/Netdisco/lib/App/Netdisco/DB/ResultSet/Device.pm @@ -1,4 +1,4 @@ -package Netdisco::DB::ResultSet::Device; +package App::Netdisco::DB::ResultSet::Device; use base 'DBIx::Class::ResultSet'; use strict; diff --git a/Netdisco/lib/Netdisco/DB/ResultSet/DevicePort.pm b/Netdisco/lib/App/Netdisco/DB/ResultSet/DevicePort.pm similarity index 98% rename from Netdisco/lib/Netdisco/DB/ResultSet/DevicePort.pm rename to Netdisco/lib/App/Netdisco/DB/ResultSet/DevicePort.pm index d2d62175..832ffa1b 100644 --- a/Netdisco/lib/Netdisco/DB/ResultSet/DevicePort.pm +++ b/Netdisco/lib/App/Netdisco/DB/ResultSet/DevicePort.pm @@ -1,4 +1,4 @@ -package Netdisco::DB::ResultSet::DevicePort; +package App::Netdisco::DB::ResultSet::DevicePort; use base 'DBIx::Class::ResultSet'; use strict; diff --git a/Netdisco/lib/Netdisco/DB/ResultSet/Node.pm b/Netdisco/lib/App/Netdisco/DB/ResultSet/Node.pm similarity index 96% rename from Netdisco/lib/Netdisco/DB/ResultSet/Node.pm rename to Netdisco/lib/App/Netdisco/DB/ResultSet/Node.pm index 713cf307..483323fa 100644 --- a/Netdisco/lib/Netdisco/DB/ResultSet/Node.pm +++ b/Netdisco/lib/App/Netdisco/DB/ResultSet/Node.pm @@ -1,4 +1,4 @@ -package Netdisco::DB::ResultSet::Node; +package App::Netdisco::DB::ResultSet::Node; use base 'DBIx::Class::ResultSet'; use strict; diff --git a/Netdisco/lib/Netdisco/DB/ResultSet/NodeIp.pm b/Netdisco/lib/App/Netdisco/DB/ResultSet/NodeIp.pm similarity index 98% rename from Netdisco/lib/Netdisco/DB/ResultSet/NodeIp.pm rename to Netdisco/lib/App/Netdisco/DB/ResultSet/NodeIp.pm index c4e2c978..6f6cde14 100644 --- a/Netdisco/lib/Netdisco/DB/ResultSet/NodeIp.pm +++ b/Netdisco/lib/App/Netdisco/DB/ResultSet/NodeIp.pm @@ -1,4 +1,4 @@ -package Netdisco::DB::ResultSet::NodeIp; +package App::Netdisco::DB::ResultSet::NodeIp; use base 'DBIx::Class::ResultSet'; use strict; diff --git a/Netdisco/lib/Netdisco/DB/schema_versions/Netdisco-DB-1-2-PostgreSQL.sql b/Netdisco/lib/App/Netdisco/DB/schema_versions/Netdisco-DB-1-2-PostgreSQL.sql similarity index 100% rename from Netdisco/lib/Netdisco/DB/schema_versions/Netdisco-DB-1-2-PostgreSQL.sql rename to Netdisco/lib/App/Netdisco/DB/schema_versions/Netdisco-DB-1-2-PostgreSQL.sql diff --git a/Netdisco/lib/Netdisco/DB/schema_versions/Netdisco-DB-1-3-PostgreSQL.sql b/Netdisco/lib/App/Netdisco/DB/schema_versions/Netdisco-DB-1-3-PostgreSQL.sql similarity index 100% rename from Netdisco/lib/Netdisco/DB/schema_versions/Netdisco-DB-1-3-PostgreSQL.sql rename to Netdisco/lib/App/Netdisco/DB/schema_versions/Netdisco-DB-1-3-PostgreSQL.sql diff --git a/Netdisco/lib/Netdisco/DB/schema_versions/Netdisco-DB-1-PostgreSQL.sql b/Netdisco/lib/App/Netdisco/DB/schema_versions/Netdisco-DB-1-PostgreSQL.sql similarity index 100% rename from Netdisco/lib/Netdisco/DB/schema_versions/Netdisco-DB-1-PostgreSQL.sql rename to Netdisco/lib/App/Netdisco/DB/schema_versions/Netdisco-DB-1-PostgreSQL.sql diff --git a/Netdisco/lib/Netdisco/DB/schema_versions/Netdisco-DB-2-3-PostgreSQL.sql b/Netdisco/lib/App/Netdisco/DB/schema_versions/Netdisco-DB-2-3-PostgreSQL.sql similarity index 100% rename from Netdisco/lib/Netdisco/DB/schema_versions/Netdisco-DB-2-3-PostgreSQL.sql rename to Netdisco/lib/App/Netdisco/DB/schema_versions/Netdisco-DB-2-3-PostgreSQL.sql diff --git a/Netdisco/lib/Netdisco/DB/schema_versions/Netdisco-DB-2-PostgreSQL.sql b/Netdisco/lib/App/Netdisco/DB/schema_versions/Netdisco-DB-2-PostgreSQL.sql similarity index 100% rename from Netdisco/lib/Netdisco/DB/schema_versions/Netdisco-DB-2-PostgreSQL.sql rename to Netdisco/lib/App/Netdisco/DB/schema_versions/Netdisco-DB-2-PostgreSQL.sql diff --git a/Netdisco/lib/Netdisco/DB/schema_versions/Netdisco-DB-3-PostgreSQL.sql b/Netdisco/lib/App/Netdisco/DB/schema_versions/Netdisco-DB-3-PostgreSQL.sql similarity index 100% rename from Netdisco/lib/Netdisco/DB/schema_versions/Netdisco-DB-3-PostgreSQL.sql rename to Netdisco/lib/App/Netdisco/DB/schema_versions/Netdisco-DB-3-PostgreSQL.sql diff --git a/Netdisco/lib/Netdisco/Daemon/DB.pm b/Netdisco/lib/App/Netdisco/Daemon/DB.pm similarity index 78% rename from Netdisco/lib/Netdisco/Daemon/DB.pm rename to Netdisco/lib/App/Netdisco/Daemon/DB.pm index 58c2d9a7..8ae43d31 100644 --- a/Netdisco/lib/Netdisco/Daemon/DB.pm +++ b/Netdisco/lib/App/Netdisco/Daemon/DB.pm @@ -1,5 +1,5 @@ use utf8; -package Netdisco::Daemon::DB; +package App::Netdisco::Daemon::DB; use strict; use warnings; @@ -13,7 +13,7 @@ our $VERSION = 1; # schema version used for upgrades, keep as integer use Path::Class; use File::Basename; -my (undef, $libpath, undef) = fileparse( $INC{ 'Netdisco/Daemon/DB.pm' } ); +my (undef, $libpath, undef) = fileparse( $INC{ 'App/Netdisco/Daemon/DB.pm' } ); our $schema_versions_dir = Path::Class::Dir->new($libpath) ->subdir("DB", "schema_versions")->stringify; diff --git a/Netdisco/lib/Netdisco/Daemon/DB/Result/Admin.pm b/Netdisco/lib/App/Netdisco/Daemon/DB/Result/Admin.pm similarity index 93% rename from Netdisco/lib/Netdisco/Daemon/DB/Result/Admin.pm rename to Netdisco/lib/App/Netdisco/Daemon/DB/Result/Admin.pm index 42cc8563..5aab62a6 100644 --- a/Netdisco/lib/Netdisco/Daemon/DB/Result/Admin.pm +++ b/Netdisco/lib/App/Netdisco/Daemon/DB/Result/Admin.pm @@ -1,5 +1,5 @@ use utf8; -package Netdisco::Daemon::DB::Result::Admin; +package App::Netdisco::Daemon::DB::Result::Admin; use strict; use warnings; diff --git a/Netdisco/lib/Netdisco/Daemon/Worker/Interactive.pm b/Netdisco/lib/App/Netdisco/Daemon/Worker/Interactive.pm similarity index 93% rename from Netdisco/lib/Netdisco/Daemon/Worker/Interactive.pm rename to Netdisco/lib/App/Netdisco/Daemon/Worker/Interactive.pm index bd3f787f..21ccdff8 100644 --- a/Netdisco/lib/Netdisco/Daemon/Worker/Interactive.pm +++ b/Netdisco/lib/App/Netdisco/Daemon/Worker/Interactive.pm @@ -1,4 +1,4 @@ -package Netdisco::Daemon::Worker::Interactive; +package App::Netdisco::Daemon::Worker::Interactive; use Dancer qw/:moose :syntax :script/; use Dancer::Plugin::DBIC 'schema'; @@ -8,8 +8,8 @@ use Role::Tiny; use namespace::clean; # add dispatch methods for interactive actions -with 'Netdisco::Daemon::Worker::Interactive::DeviceActions', - 'Netdisco::Daemon::Worker::Interactive::PortActions'; +with 'App::Netdisco::Daemon::Worker::Interactive::DeviceActions', + 'App::Netdisco::Daemon::Worker::Interactive::PortActions'; sub worker_body { my $self = shift; diff --git a/Netdisco/lib/Netdisco/Daemon/Worker/Interactive/DeviceActions.pm b/Netdisco/lib/App/Netdisco/Daemon/Worker/Interactive/DeviceActions.pm similarity index 84% rename from Netdisco/lib/Netdisco/Daemon/Worker/Interactive/DeviceActions.pm rename to Netdisco/lib/App/Netdisco/Daemon/Worker/Interactive/DeviceActions.pm index 01e36c1a..3a411f17 100644 --- a/Netdisco/lib/Netdisco/Daemon/Worker/Interactive/DeviceActions.pm +++ b/Netdisco/lib/App/Netdisco/Daemon/Worker/Interactive/DeviceActions.pm @@ -1,7 +1,7 @@ -package Netdisco::Daemon::Worker::Interactive::DeviceActions; +package App::Netdisco::Daemon::Worker::Interactive::DeviceActions; -use Netdisco::Util::Connect qw/snmp_connect get_device/; -use Netdisco::Daemon::Worker::Interactive::Util ':all'; +use App::Netdisco::Util::Connect qw/snmp_connect get_device/; +use App::Netdisco::Daemon::Worker::Interactive::Util ':all'; use Role::Tiny; use namespace::clean; diff --git a/Netdisco/lib/Netdisco/Daemon/Worker/Interactive/PortActions.pm b/Netdisco/lib/App/Netdisco/Daemon/Worker/Interactive/PortActions.pm similarity index 94% rename from Netdisco/lib/Netdisco/Daemon/Worker/Interactive/PortActions.pm rename to Netdisco/lib/App/Netdisco/Daemon/Worker/Interactive/PortActions.pm index 25a0ad54..38e44f78 100644 --- a/Netdisco/lib/Netdisco/Daemon/Worker/Interactive/PortActions.pm +++ b/Netdisco/lib/App/Netdisco/Daemon/Worker/Interactive/PortActions.pm @@ -1,8 +1,8 @@ -package Netdisco::Daemon::Worker::Interactive::PortActions; +package App::Netdisco::Daemon::Worker::Interactive::PortActions; -use Netdisco::Util::Connect ':all'; -use Netdisco::Util::Permissions ':all'; -use Netdisco::Daemon::Worker::Interactive::Util ':all'; +use App::Netdisco::Util::Connect ':all'; +use App::Netdisco::Util::Permissions ':all'; +use App::Netdisco::Daemon::Worker::Interactive::Util ':all'; use Role::Tiny; use namespace::clean; diff --git a/Netdisco/lib/Netdisco/Daemon/Worker/Interactive/Util.pm b/Netdisco/lib/App/Netdisco/Daemon/Worker/Interactive/Util.pm similarity index 81% rename from Netdisco/lib/Netdisco/Daemon/Worker/Interactive/Util.pm rename to Netdisco/lib/App/Netdisco/Daemon/Worker/Interactive/Util.pm index 273e4a12..b6844bbf 100644 --- a/Netdisco/lib/Netdisco/Daemon/Worker/Interactive/Util.pm +++ b/Netdisco/lib/App/Netdisco/Daemon/Worker/Interactive/Util.pm @@ -1,4 +1,4 @@ -package Netdisco::Daemon::Worker::Interactive::Util; +package App::Netdisco::Daemon::Worker::Interactive::Util; # support utilities for Daemon Actions diff --git a/Netdisco/lib/Netdisco/Daemon/Worker/Manager.pm b/Netdisco/lib/App/Netdisco/Daemon/Worker/Manager.pm similarity index 96% rename from Netdisco/lib/Netdisco/Daemon/Worker/Manager.pm rename to Netdisco/lib/App/Netdisco/Daemon/Worker/Manager.pm index a957661e..f24926fe 100644 --- a/Netdisco/lib/Netdisco/Daemon/Worker/Manager.pm +++ b/Netdisco/lib/App/Netdisco/Daemon/Worker/Manager.pm @@ -1,9 +1,9 @@ -package Netdisco::Daemon::Worker::Manager; +package App::Netdisco::Daemon::Worker::Manager; use Dancer qw/:moose :syntax :script/; use Dancer::Plugin::DBIC 'schema'; -use Netdisco::Util::DeviceProperties 'is_discoverable'; +use App::Netdisco::Util::DeviceProperties 'is_discoverable'; use Try::Tiny; use Role::Tiny; diff --git a/Netdisco/lib/Netdisco/Util/Connect.pm b/Netdisco/lib/App/Netdisco/Util/Connect.pm similarity index 97% rename from Netdisco/lib/Netdisco/Util/Connect.pm rename to Netdisco/lib/App/Netdisco/Util/Connect.pm index 32eac2a3..4d249845 100644 --- a/Netdisco/lib/Netdisco/Util/Connect.pm +++ b/Netdisco/lib/App/Netdisco/Util/Connect.pm @@ -1,4 +1,4 @@ -package Netdisco::Util::Connect; +package App::Netdisco::Util::Connect; use Dancer qw/:syntax :script/; use Dancer::Plugin::DBIC 'schema'; @@ -17,7 +17,7 @@ our %EXPORT_TAGS = ( /], ); -=head1 Netdisco::Util::Connect +=head1 App::Netdisco::Util::Connect A set of helper subroutines to support parts of the Netdisco application. diff --git a/Netdisco/lib/Netdisco/Util/DeviceProperties.pm b/Netdisco/lib/App/Netdisco/Util/DeviceProperties.pm similarity index 95% rename from Netdisco/lib/Netdisco/Util/DeviceProperties.pm rename to Netdisco/lib/App/Netdisco/Util/DeviceProperties.pm index 01d00583..143d133e 100644 --- a/Netdisco/lib/Netdisco/Util/DeviceProperties.pm +++ b/Netdisco/lib/App/Netdisco/Util/DeviceProperties.pm @@ -1,4 +1,4 @@ -package Netdisco::Util::DeviceProperties; +package App::Netdisco::Util::DeviceProperties; use Dancer qw/:syntax :script/; use Dancer::Plugin::DBIC 'schema'; @@ -18,7 +18,7 @@ our %EXPORT_TAGS = ( /], ); -=head1 Netdisco::Util::DeviceProperties; +=head1 App::Netdisco::Util::DeviceProperties; A set of helper subroutines to support parts of the Netdisco application. diff --git a/Netdisco/lib/Netdisco/Util/Permissions.pm b/Netdisco/lib/App/Netdisco/Util/Permissions.pm similarity index 91% rename from Netdisco/lib/Netdisco/Util/Permissions.pm rename to Netdisco/lib/App/Netdisco/Util/Permissions.pm index 71873da0..96b6a9a7 100644 --- a/Netdisco/lib/Netdisco/Util/Permissions.pm +++ b/Netdisco/lib/App/Netdisco/Util/Permissions.pm @@ -1,9 +1,9 @@ -package Netdisco::Util::Permissions; +package App::Netdisco::Util::Permissions; use Dancer qw/:syntax :script/; use Dancer::Plugin::DBIC 'schema'; -use Netdisco::Util::DeviceProperties ':all'; +use App::Netdisco::Util::DeviceProperties ':all'; use base 'Exporter'; our @EXPORT = (); @@ -16,7 +16,7 @@ our %EXPORT_TAGS = ( /], ); -=head1 Netdisco::Util::Permissions +=head1 App::Netdisco::Util::Permissions A set of helper subroutines to support parts of the Netdisco application. diff --git a/Netdisco/lib/Netdisco/Util/Web.pm b/Netdisco/lib/App/Netdisco/Util/Web.pm similarity index 97% rename from Netdisco/lib/Netdisco/Util/Web.pm rename to Netdisco/lib/App/Netdisco/Util/Web.pm index 75726084..92a153b0 100644 --- a/Netdisco/lib/Netdisco/Util/Web.pm +++ b/Netdisco/lib/App/Netdisco/Util/Web.pm @@ -1,4 +1,4 @@ -package Netdisco::Util::Web; +package App::Netdisco::Util::Web; use base 'Exporter'; our @EXPORT = (); @@ -11,7 +11,7 @@ our %EXPORT_TAGS = ( /], ); -=head1 Netdisco::Util::Web +=head1 App::Netdisco::Util::Web A set of helper subroutines to support parts of the Netdisco application. diff --git a/Netdisco/lib/Netdisco/Web.pm b/Netdisco/lib/App/Netdisco/Web.pm similarity index 78% rename from Netdisco/lib/Netdisco/Web.pm rename to Netdisco/lib/App/Netdisco/Web.pm index f4861ba4..cf2b9276 100644 --- a/Netdisco/lib/Netdisco/Web.pm +++ b/Netdisco/lib/App/Netdisco/Web.pm @@ -1,4 +1,4 @@ -package Netdisco::Web; +package App::Netdisco::Web; use Dancer ':syntax'; use Dancer::Plugin::Ajax; @@ -9,11 +9,11 @@ use Socket6 (); # to ensure dependency is met use HTML::Entities (); # to ensure dependency is met use URI::QueryParam (); # part of URI, to add helper methods -use Netdisco::Web::AuthN; -use Netdisco::Web::Search; -use Netdisco::Web::Device; -use Netdisco::Web::PortControl; -use Netdisco::Web::Inventory; +use App::Netdisco::Web::AuthN; +use App::Netdisco::Web::Search; +use App::Netdisco::Web::Device; +use App::Netdisco::Web::PortControl; +use App::Netdisco::Web::Inventory; hook 'before_template' => sub { my $tokens = shift; diff --git a/Netdisco/lib/Netdisco/Web/AuthN.pm b/Netdisco/lib/App/Netdisco/Web/AuthN.pm similarity index 96% rename from Netdisco/lib/Netdisco/Web/AuthN.pm rename to Netdisco/lib/App/Netdisco/Web/AuthN.pm index 1b9f4c5c..f560a108 100644 --- a/Netdisco/lib/Netdisco/Web/AuthN.pm +++ b/Netdisco/lib/App/Netdisco/Web/AuthN.pm @@ -1,4 +1,4 @@ -package Netdisco::Web::AuthN; +package App::Netdisco::Web::AuthN; use Dancer ':syntax'; use Dancer::Plugin::DBIC; diff --git a/Netdisco/lib/Netdisco/Web/Device.pm b/Netdisco/lib/App/Netdisco/Web/Device.pm similarity index 98% rename from Netdisco/lib/Netdisco/Web/Device.pm rename to Netdisco/lib/App/Netdisco/Web/Device.pm index 3716da23..c36c895e 100644 --- a/Netdisco/lib/Netdisco/Web/Device.pm +++ b/Netdisco/lib/App/Netdisco/Web/Device.pm @@ -1,11 +1,11 @@ -package Netdisco::Web::Device; +package App::Netdisco::Web::Device; use Dancer ':syntax'; use Dancer::Plugin::Ajax; use Dancer::Plugin::DBIC; use NetAddr::IP::Lite ':lower'; -use Netdisco::Util::Web (); # for sort_port +use App::Netdisco::Util::Web (); # for sort_port hook 'before' => sub { # list of port detail columns @@ -241,7 +241,7 @@ ajax '/ajax/content/device/ports' => sub { if param('c_neighbors'); # sort ports (empty set would be a 'no records' msg) - my $results = [ sort { &Netdisco::Util::Web::sort_port($a->port, $b->port) } $set->all ]; + my $results = [ sort { &App::Netdisco::Util::Web::sort_port($a->port, $b->port) } $set->all ]; return unless scalar @$results; content_type('text/html'); diff --git a/Netdisco/lib/Netdisco/Web/Inventory.pm b/Netdisco/lib/App/Netdisco/Web/Inventory.pm similarity index 90% rename from Netdisco/lib/Netdisco/Web/Inventory.pm rename to Netdisco/lib/App/Netdisco/Web/Inventory.pm index 74eef1cf..0cd33dc3 100644 --- a/Netdisco/lib/Netdisco/Web/Inventory.pm +++ b/Netdisco/lib/App/Netdisco/Web/Inventory.pm @@ -1,4 +1,4 @@ -package Netdisco::Web::Inventory; +package App::Netdisco::Web::Inventory; use Dancer ':syntax'; use Dancer::Plugin::DBIC; diff --git a/Netdisco/lib/Netdisco/Web/PortControl.pm b/Netdisco/lib/App/Netdisco/Web/PortControl.pm similarity index 97% rename from Netdisco/lib/Netdisco/Web/PortControl.pm rename to Netdisco/lib/App/Netdisco/Web/PortControl.pm index 312009f2..acbb966c 100644 --- a/Netdisco/lib/Netdisco/Web/PortControl.pm +++ b/Netdisco/lib/App/Netdisco/Web/PortControl.pm @@ -1,4 +1,4 @@ -package Netdisco::Web::PortControl; +package App::Netdisco::Web::PortControl; use Dancer ':syntax'; use Dancer::Plugin::Ajax; diff --git a/Netdisco/lib/Netdisco/Web/Search.pm b/Netdisco/lib/App/Netdisco/Web/Search.pm similarity index 99% rename from Netdisco/lib/Netdisco/Web/Search.pm rename to Netdisco/lib/App/Netdisco/Web/Search.pm index 7d643c74..fde603eb 100644 --- a/Netdisco/lib/Netdisco/Web/Search.pm +++ b/Netdisco/lib/App/Netdisco/Web/Search.pm @@ -1,4 +1,4 @@ -package Netdisco::Web::Search; +package App::Netdisco::Web::Search; use Dancer ':syntax'; use Dancer::Plugin::Ajax; diff --git a/Netdisco/lib/auto/App/Netdisco b/Netdisco/lib/auto/App/Netdisco new file mode 120000 index 00000000..99fb8743 --- /dev/null +++ b/Netdisco/lib/auto/App/Netdisco @@ -0,0 +1 @@ +../../../share \ No newline at end of file diff --git a/Netdisco/config.yml b/Netdisco/share/config.yml similarity index 100% rename from Netdisco/config.yml rename to Netdisco/share/config.yml diff --git a/Netdisco/environments/development.yml b/Netdisco/share/environments/development.yml similarity index 93% rename from Netdisco/environments/development.yml rename to Netdisco/share/environments/development.yml index d67a4db7..c09d0334 100644 --- a/Netdisco/environments/development.yml +++ b/Netdisco/share/environments/development.yml @@ -22,7 +22,7 @@ plugins: DBIC: # alter dsn/user/pass for your local Netdisco DB netdisco: - schema_class: 'Netdisco::DB' + schema_class: 'App::Netdisco::DB' dsn: 'dbi:Pg:dbname=netdisco;host=localhost' user: 'netdisco' pass: 'netdisco' @@ -32,7 +32,7 @@ plugins: # please do not change/remove this schema unless you # know what you're doing! daemon: - schema_class: 'Netdisco::Daemon::DB' + schema_class: 'App::Netdisco::Daemon::DB' dsn: 'dbi:SQLite:dbname=/tmp/netdisco-daemon.db' options: RaiseError: 1 diff --git a/Netdisco/environments/production.yml b/Netdisco/share/environments/production.yml similarity index 91% rename from Netdisco/environments/production.yml rename to Netdisco/share/environments/production.yml index 7730db58..049495bf 100644 --- a/Netdisco/environments/production.yml +++ b/Netdisco/share/environments/production.yml @@ -20,7 +20,7 @@ plugins: DBIC: # alter dsn/user/pass for your local Netdisco DB netdisco: - schema_class: 'Netdisco::DB' + schema_class: 'App::Netdisco::DB' dsn: 'dbi:Pg:dbname=netdisco;host=localhost' user: 'changeme' pass: 'netdisco' @@ -30,7 +30,7 @@ plugins: # please do not change/remove this schema unless you # know what you're doing! daemon: - schema_class: 'Netdisco::Daemon::DB' + schema_class: 'App::Netdisco::Daemon::DB' dsn: 'dbi:SQLite:dbname=/tmp/netdisco-daemon.db' options: RaiseError: 1 diff --git a/Netdisco/public/500.html b/Netdisco/share/public/500.html similarity index 100% rename from Netdisco/public/500.html rename to Netdisco/share/public/500.html diff --git a/Netdisco/public/css/bootstrap.min.css b/Netdisco/share/public/css/bootstrap.min.css similarity index 100% rename from Netdisco/public/css/bootstrap.min.css rename to Netdisco/share/public/css/bootstrap.min.css diff --git a/Netdisco/public/css/font-awesome.css b/Netdisco/share/public/css/font-awesome.css similarity index 100% rename from Netdisco/public/css/font-awesome.css rename to Netdisco/share/public/css/font-awesome.css diff --git a/Netdisco/public/css/nd_print.css b/Netdisco/share/public/css/nd_print.css similarity index 100% rename from Netdisco/public/css/nd_print.css rename to Netdisco/share/public/css/nd_print.css diff --git a/Netdisco/public/css/netdisco.css b/Netdisco/share/public/css/netdisco.css similarity index 100% rename from Netdisco/public/css/netdisco.css rename to Netdisco/share/public/css/netdisco.css diff --git a/Netdisco/public/css/toastr.css b/Netdisco/share/public/css/toastr.css similarity index 100% rename from Netdisco/public/css/toastr.css rename to Netdisco/share/public/css/toastr.css diff --git a/Netdisco/public/dispatch.cgi b/Netdisco/share/public/dispatch.cgi similarity index 100% rename from Netdisco/public/dispatch.cgi rename to Netdisco/share/public/dispatch.cgi diff --git a/Netdisco/public/dispatch.fcgi b/Netdisco/share/public/dispatch.fcgi similarity index 100% rename from Netdisco/public/dispatch.fcgi rename to Netdisco/share/public/dispatch.fcgi diff --git a/Netdisco/public/font/fontawesome-webfont.eot b/Netdisco/share/public/font/fontawesome-webfont.eot similarity index 100% rename from Netdisco/public/font/fontawesome-webfont.eot rename to Netdisco/share/public/font/fontawesome-webfont.eot diff --git a/Netdisco/public/font/fontawesome-webfont.svg b/Netdisco/share/public/font/fontawesome-webfont.svg similarity index 100% rename from Netdisco/public/font/fontawesome-webfont.svg rename to Netdisco/share/public/font/fontawesome-webfont.svg diff --git a/Netdisco/public/font/fontawesome-webfont.ttf b/Netdisco/share/public/font/fontawesome-webfont.ttf similarity index 100% rename from Netdisco/public/font/fontawesome-webfont.ttf rename to Netdisco/share/public/font/fontawesome-webfont.ttf diff --git a/Netdisco/public/font/fontawesome-webfont.woff b/Netdisco/share/public/font/fontawesome-webfont.woff similarity index 100% rename from Netdisco/public/font/fontawesome-webfont.woff rename to Netdisco/share/public/font/fontawesome-webfont.woff diff --git a/Netdisco/public/images/crystalclear_mag.png b/Netdisco/share/public/images/crystalclear_mag.png similarity index 100% rename from Netdisco/public/images/crystalclear_mag.png rename to Netdisco/share/public/images/crystalclear_mag.png diff --git a/Netdisco/public/images/diagona_settings.png b/Netdisco/share/public/images/diagona_settings.png similarity index 100% rename from Netdisco/public/images/diagona_settings.png rename to Netdisco/share/public/images/diagona_settings.png diff --git a/Netdisco/public/images/dusseldorf_settings.png b/Netdisco/share/public/images/dusseldorf_settings.png similarity index 100% rename from Netdisco/public/images/dusseldorf_settings.png rename to Netdisco/share/public/images/dusseldorf_settings.png diff --git a/Netdisco/public/images/glyphicons_072_bookmark.png b/Netdisco/share/public/images/glyphicons_072_bookmark.png similarity index 100% rename from Netdisco/public/images/glyphicons_072_bookmark.png rename to Netdisco/share/public/images/glyphicons_072_bookmark.png diff --git a/Netdisco/public/images/matte_basic_pin.png b/Netdisco/share/public/images/matte_basic_pin.png similarity index 100% rename from Netdisco/public/images/matte_basic_pin.png rename to Netdisco/share/public/images/matte_basic_pin.png diff --git a/Netdisco/public/images/splashyfish_left.png b/Netdisco/share/public/images/splashyfish_left.png similarity index 100% rename from Netdisco/public/images/splashyfish_left.png rename to Netdisco/share/public/images/splashyfish_left.png diff --git a/Netdisco/public/images/splashyfish_right.png b/Netdisco/share/public/images/splashyfish_right.png similarity index 100% rename from Netdisco/public/images/splashyfish_right.png rename to Netdisco/share/public/images/splashyfish_right.png diff --git a/Netdisco/public/images/tango_sweep.png b/Netdisco/share/public/images/tango_sweep.png similarity index 100% rename from Netdisco/public/images/tango_sweep.png rename to Netdisco/share/public/images/tango_sweep.png diff --git a/Netdisco/public/images/vaga_copy.png b/Netdisco/share/public/images/vaga_copy.png similarity index 100% rename from Netdisco/public/images/vaga_copy.png rename to Netdisco/share/public/images/vaga_copy.png diff --git a/Netdisco/public/javascripts/bootstrap.min.js b/Netdisco/share/public/javascripts/bootstrap.min.js similarity index 100% rename from Netdisco/public/javascripts/bootstrap.min.js rename to Netdisco/share/public/javascripts/bootstrap.min.js diff --git a/Netdisco/public/javascripts/d3.min.js b/Netdisco/share/public/javascripts/d3.min.js similarity index 100% rename from Netdisco/public/javascripts/d3.min.js rename to Netdisco/share/public/javascripts/d3.min.js diff --git a/Netdisco/public/javascripts/jquery-deserialize.js b/Netdisco/share/public/javascripts/jquery-deserialize.js similarity index 100% rename from Netdisco/public/javascripts/jquery-deserialize.js rename to Netdisco/share/public/javascripts/jquery-deserialize.js diff --git a/Netdisco/public/javascripts/jquery-history.js b/Netdisco/share/public/javascripts/jquery-history.js similarity index 100% rename from Netdisco/public/javascripts/jquery-history.js rename to Netdisco/share/public/javascripts/jquery-history.js diff --git a/Netdisco/public/javascripts/jquery-latest.min.js b/Netdisco/share/public/javascripts/jquery-latest.min.js similarity index 100% rename from Netdisco/public/javascripts/jquery-latest.min.js rename to Netdisco/share/public/javascripts/jquery-latest.min.js diff --git a/Netdisco/public/javascripts/netdisco.js b/Netdisco/share/public/javascripts/netdisco.js similarity index 100% rename from Netdisco/public/javascripts/netdisco.js rename to Netdisco/share/public/javascripts/netdisco.js diff --git a/Netdisco/public/javascripts/netdisco_portcontrol.js b/Netdisco/share/public/javascripts/netdisco_portcontrol.js similarity index 100% rename from Netdisco/public/javascripts/netdisco_portcontrol.js rename to Netdisco/share/public/javascripts/netdisco_portcontrol.js diff --git a/Netdisco/public/javascripts/toastr.js b/Netdisco/share/public/javascripts/toastr.js similarity index 100% rename from Netdisco/public/javascripts/toastr.js rename to Netdisco/share/public/javascripts/toastr.js diff --git a/Netdisco/views/ajax/device/addresses.tt b/Netdisco/share/views/ajax/device/addresses.tt similarity index 100% rename from Netdisco/views/ajax/device/addresses.tt rename to Netdisco/share/views/ajax/device/addresses.tt diff --git a/Netdisco/views/ajax/device/details.tt b/Netdisco/share/views/ajax/device/details.tt similarity index 100% rename from Netdisco/views/ajax/device/details.tt rename to Netdisco/share/views/ajax/device/details.tt diff --git a/Netdisco/views/ajax/device/netmap.tt b/Netdisco/share/views/ajax/device/netmap.tt similarity index 100% rename from Netdisco/views/ajax/device/netmap.tt rename to Netdisco/share/views/ajax/device/netmap.tt diff --git a/Netdisco/views/ajax/device/ports.tt b/Netdisco/share/views/ajax/device/ports.tt similarity index 100% rename from Netdisco/views/ajax/device/ports.tt rename to Netdisco/share/views/ajax/device/ports.tt diff --git a/Netdisco/views/ajax/search/device.tt b/Netdisco/share/views/ajax/search/device.tt similarity index 100% rename from Netdisco/views/ajax/search/device.tt rename to Netdisco/share/views/ajax/search/device.tt diff --git a/Netdisco/views/ajax/search/node_by_ip.tt b/Netdisco/share/views/ajax/search/node_by_ip.tt similarity index 100% rename from Netdisco/views/ajax/search/node_by_ip.tt rename to Netdisco/share/views/ajax/search/node_by_ip.tt diff --git a/Netdisco/views/ajax/search/node_by_mac.tt b/Netdisco/share/views/ajax/search/node_by_mac.tt similarity index 100% rename from Netdisco/views/ajax/search/node_by_mac.tt rename to Netdisco/share/views/ajax/search/node_by_mac.tt diff --git a/Netdisco/views/ajax/search/port.tt b/Netdisco/share/views/ajax/search/port.tt similarity index 100% rename from Netdisco/views/ajax/search/port.tt rename to Netdisco/share/views/ajax/search/port.tt diff --git a/Netdisco/views/ajax/search/vlan.tt b/Netdisco/share/views/ajax/search/vlan.tt similarity index 100% rename from Netdisco/views/ajax/search/vlan.tt rename to Netdisco/share/views/ajax/search/vlan.tt diff --git a/Netdisco/views/device.tt b/Netdisco/share/views/device.tt similarity index 100% rename from Netdisco/views/device.tt rename to Netdisco/share/views/device.tt diff --git a/Netdisco/views/index.tt b/Netdisco/share/views/index.tt similarity index 100% rename from Netdisco/views/index.tt rename to Netdisco/share/views/index.tt diff --git a/Netdisco/views/inventory.tt b/Netdisco/share/views/inventory.tt similarity index 100% rename from Netdisco/views/inventory.tt rename to Netdisco/share/views/inventory.tt diff --git a/Netdisco/views/js/common.js b/Netdisco/share/views/js/common.js similarity index 100% rename from Netdisco/views/js/common.js rename to Netdisco/share/views/js/common.js diff --git a/Netdisco/views/js/device.js b/Netdisco/share/views/js/device.js similarity index 100% rename from Netdisco/views/js/device.js rename to Netdisco/share/views/js/device.js diff --git a/Netdisco/views/js/search.js b/Netdisco/share/views/js/search.js similarity index 100% rename from Netdisco/views/js/search.js rename to Netdisco/share/views/js/search.js diff --git a/Netdisco/views/layouts/main.tt b/Netdisco/share/views/layouts/main.tt similarity index 100% rename from Netdisco/views/layouts/main.tt rename to Netdisco/share/views/layouts/main.tt diff --git a/Netdisco/views/report.tt b/Netdisco/share/views/report.tt similarity index 100% rename from Netdisco/views/report.tt rename to Netdisco/share/views/report.tt diff --git a/Netdisco/views/search.tt b/Netdisco/share/views/search.tt similarity index 100% rename from Netdisco/views/search.tt rename to Netdisco/share/views/search.tt diff --git a/Netdisco/views/sidebar/device/ports.tt b/Netdisco/share/views/sidebar/device/ports.tt similarity index 100% rename from Netdisco/views/sidebar/device/ports.tt rename to Netdisco/share/views/sidebar/device/ports.tt diff --git a/Netdisco/views/sidebar/search/device.tt b/Netdisco/share/views/sidebar/search/device.tt similarity index 100% rename from Netdisco/views/sidebar/search/device.tt rename to Netdisco/share/views/sidebar/search/device.tt diff --git a/Netdisco/views/sidebar/search/node.tt b/Netdisco/share/views/sidebar/search/node.tt similarity index 100% rename from Netdisco/views/sidebar/search/node.tt rename to Netdisco/share/views/sidebar/search/node.tt