Skip to content

Commit 1dc4f33

Browse files
devkapilbansaldevkapilbansal
authored
[chores] Make lib modules as non-executable #60
Closes #60
1 parent a3b1c1e commit 1dc4f33

17 files changed

Lines changed: 51 additions & 49 deletions

‎openwrt-openwisp-monitoring/Makefile‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -51,39 +51,39 @@ endef
5151
define Package/netjson-monitoring/install
5252
$(INSTALL_DIR) \
5353
$(1)/usr/sbin \
54-
$(1)/usr/lib/lua/openwisp
54+
$(1)/usr/lib/lua/openwisp_monitoring
5555

5656
$(INSTALL_BIN) \
5757
files/sbin/netjson-monitoring.lua \
5858
$(1)/usr/sbin/netjson_monitoring
5959

60-
$(INSTALL_BIN) \
61-
files/lib/openwisp/dhcp.lua \
62-
$(1)/usr/lib/lua/openwisp/dhcp.lua
60+
$(INSTALL_DATA) \
61+
files/lib/openwisp_monitoring/dhcp.lua \
62+
$(1)/usr/lib/lua/openwisp_monitoring/dhcp.lua
6363

64-
$(INSTALL_BIN) \
65-
files/lib/openwisp/interfaces.lua \
66-
$(1)/usr/lib/lua/openwisp/interfaces.lua
64+
$(INSTALL_DATA) \
65+
files/lib/openwisp_monitoring/interfaces.lua \
66+
$(1)/usr/lib/lua/openwisp_monitoring/interfaces.lua
6767

68-
$(INSTALL_BIN) \
69-
files/lib/openwisp/monitoring.lua \
70-
$(1)/usr/lib/lua/openwisp/monitoring.lua
68+
$(INSTALL_DATA) \
69+
files/lib/openwisp_monitoring/monitoring.lua \
70+
$(1)/usr/lib/lua/openwisp_monitoring/monitoring.lua
7171

72-
$(INSTALL_BIN) \
73-
files/lib/openwisp/monitoring_utils.lua \
74-
$(1)/usr/lib/lua/openwisp/monitoring_utils.lua
72+
$(INSTALL_DATA) \
73+
files/lib/openwisp_monitoring/utils.lua \
74+
$(1)/usr/lib/lua/openwisp_monitoring/utils.lua
7575

76-
$(INSTALL_BIN) \
77-
files/lib/openwisp/neighbors.lua \
78-
$(1)/usr/lib/lua/openwisp/neighbors.lua
76+
$(INSTALL_DATA) \
77+
files/lib/openwisp_monitoring/neighbors.lua \
78+
$(1)/usr/lib/lua/openwisp_monitoring/neighbors.lua
7979

80-
$(INSTALL_BIN) \
81-
files/lib/openwisp/resources.lua \
82-
$(1)/usr/lib/lua/openwisp/resources.lua
80+
$(INSTALL_DATA) \
81+
files/lib/openwisp_monitoring/resources.lua \
82+
$(1)/usr/lib/lua/openwisp_monitoring/resources.lua
8383

84-
$(INSTALL_BIN) \
85-
files/lib/openwisp/wifi.lua \
86-
$(1)/usr/lib/lua/openwisp/wifi.lua
84+
$(INSTALL_DATA) \
85+
files/lib/openwisp_monitoring/wifi.lua \
86+
$(1)/usr/lib/lua/openwisp_monitoring/wifi.lua
8787

8888
endef
8989

‎openwrt-openwisp-monitoring/files/lib/openwisp/monitoring.lua‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

openwrt-openwisp-monitoring/files/lib/openwisp/dhcp.lua renamed to openwrt-openwisp-monitoring/files/lib/openwisp_monitoring/dhcp.lua

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
package.path = package.path .. ";../files/lib/?.lua"
2-
31
-- retrieve dhcp leases
4-
local utils = require('openwisp.monitoring_utils')
2+
local utils = require('openwisp_monitoring.utils')
53
local uci = require('uci')
64
local uci_cursor = uci.cursor()
75
local io = require('io')

openwrt-openwisp-monitoring/files/lib/openwisp/interfaces.lua renamed to openwrt-openwisp-monitoring/files/lib/openwisp_monitoring/interfaces.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
-- retrieve interfaces information
2-
local utils = require('openwisp.monitoring_utils')
2+
local utils = require('openwisp_monitoring.utils')
33

44
local cjson = require('cjson')
55
local nixio = require('nixio')

‎openwrt-openwisp-monitoring/files/lib/openwisp_monitoring/monitoring.lua‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package.path = package.path .. ";../files/lib/?.lua"
2+
3+
local monitoring = {}
4+
5+
monitoring.dhcp = require('openwisp_monitoring.dhcp')
6+
monitoring.interfaces = require('openwisp_monitoring.interfaces')
7+
monitoring.neighbors = require('openwisp_monitoring.neighbors')
8+
monitoring.resources = require('openwisp_monitoring.resources')
9+
monitoring.utils = require('openwisp_monitoring.utils')
10+
monitoring.wifi = require('openwisp_monitoring.wifi')
11+
12+
return monitoring

openwrt-openwisp-monitoring/files/lib/openwisp/neighbors.lua renamed to openwrt-openwisp-monitoring/files/lib/openwisp_monitoring/neighbors.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
-- retrieve neighbors information
22
local cjson = require('cjson')
33
local io = require('io')
4-
local utils = require('openwisp.monitoring_utils')
4+
local utils = require('openwisp_monitoring.utils')
55

66
local neighbors = {}
77

openwrt-openwisp-monitoring/files/lib/openwisp/resources.lua renamed to openwrt-openwisp-monitoring/files/lib/openwisp_monitoring/resources.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
-- retrieve resources usage
22
local io = require('io')
3-
local utils = require('openwisp.monitoring_utils')
3+
local utils = require('openwisp_monitoring.utils')
44

55
local resources = {}
66

openwrt-openwisp-monitoring/files/lib/openwisp/monitoring_utils.lua renamed to openwrt-openwisp-monitoring/files/lib/openwisp_monitoring/utils.lua

File renamed without changes.

openwrt-openwisp-monitoring/files/lib/openwisp/wifi.lua renamed to openwrt-openwisp-monitoring/files/lib/openwisp_monitoring/wifi.lua

File renamed without changes.

‎openwrt-openwisp-monitoring/files/sbin/netjson-monitoring.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ local ubus_lib = require('ubus')
1111
local ubus = ubus_lib.connect()
1212
if not ubus then error('Failed to connect to ubusd') end
1313

14-
local monitoring = require('openwisp.monitoring')
14+
local monitoring = require('openwisp_monitoring.monitoring')
1515

1616
-- collect system info
1717
local system_info = ubus:call('system', 'info', {})

0 commit comments

Comments
 (0)