Commit b8a8482f authored by Kaarle Ritvanen's avatar Kaarle Ritvanen

search for optional policies in /etc/awall/optional

parent 409f7a49
......@@ -6,6 +6,7 @@ ROOT_DIR := /
LUA_VERSION := 5.1
poldir := usr/share/awall
confdir := etc/awall
all: install
......@@ -38,9 +39,10 @@ $(eval $(call copy,json,$(poldir)/mandatory,json))
$(eval $(call rename,awall-cli,usr/sbin/awall,755))
$(eval $(call rename,sample-policy.json,$(poldir)/sample/sample-policy.json,644))
$(eval $(call mkdir,etc/awall))
$(eval $(call mkdir,var/run/awall))
$(eval $(call mkdir,$(confdir)))
$(eval $(call mkdir,$(confdir)/optional))
$(eval $(call mkdir,$(poldir)/optional))
$(eval $(call mkdir,var/run/awall))
install: $(foreach f,$(files),$(ROOT_DIR)/$(f))
......
......@@ -113,7 +113,8 @@ PolicySet = awall.object.class()
function PolicySet:init(confdirs, importdirs)
self.autodirs = confdirs or {'/usr/share/awall/mandatory', '/etc/awall'}
self.confdir = self.autodirs[#self.autodirs]
self.importdirs = importdirs or {'/usr/share/awall/optional'}
self.importdirs = importdirs or {'/usr/share/awall/optional',
'/etc/awall/optional'}
end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment