diff options
| author | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2018-08-04 13:23:44 +0300 |
|---|---|---|
| committer | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2018-08-06 16:07:00 +0300 |
| commit | 57d9d985454174a3d93c0136928a3021aa131940 (patch) | |
| tree | 14b167dd08696a5610c686d7b79e4d27b061f2df | |
| parent | b36f5f5a9397c9f17b1ef2846a796c7de732cbfb (diff) | |
| download | awall-57d9d985454174a3d93c0136928a3021aa131940.tar.bz2 awall-57d9d985454174a3d93c0136928a3021aa131940.tar.xz | |
json: rename directory
| -rw-r--r-- | Makefile | 4 | ||||
| -rwxr-xr-x | awall-cli | 2 | ||||
| -rw-r--r-- | mandatory/defaults.json (renamed from json/defaults.json) | 0 | ||||
| -rw-r--r-- | mandatory/masquerade.json (renamed from json/masquerade.json) | 0 | ||||
| -rw-r--r-- | mandatory/services.json (renamed from json/services.json) | 0 |
5 files changed, 3 insertions, 3 deletions
@@ -1,5 +1,5 @@ # Installer Makefile for Alpine Wall -# Copyright (C) 2012-2017 Kaarle Ritvanen +# Copyright (C) 2012-2018 Kaarle Ritvanen # See LICENSE file for license details ROOT_DIR := / @@ -34,7 +34,7 @@ files += $(2) endef $(eval $(call copy,awall,usr/share/lua/$(LUA_VERSION)/awall,lua)) -$(eval $(call copy,json,$(resdir)/mandatory,json)) +$(eval $(call copy,mandatory,$(resdir)/mandatory,json)) $(eval $(call rename,awall-cli,usr/sbin/awall,755)) $(eval $(call rename,sample-policy.json,$(resdir)/sample/sample-policy.json,644)) @@ -147,7 +147,7 @@ end if dev_mode then util.setdefault(pol_paths, 'mandatory', {'/etc/awall'}) - table.insert(pol_paths.mandatory, basedir..'/json') + table.insert(pol_paths.mandatory, basedir..'/mandatory') end uerror = require('awall.uerror') diff --git a/json/defaults.json b/mandatory/defaults.json index b0e1082..b0e1082 100644 --- a/json/defaults.json +++ b/mandatory/defaults.json diff --git a/json/masquerade.json b/mandatory/masquerade.json index 98e2d61..98e2d61 100644 --- a/json/masquerade.json +++ b/mandatory/masquerade.json diff --git a/json/services.json b/mandatory/services.json index 4589eee..4589eee 100644 --- a/json/services.json +++ b/mandatory/services.json |