diff options
| author | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2012-03-16 13:02:18 +0000 |
|---|---|---|
| committer | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2012-03-16 13:02:18 +0000 |
| commit | 02587950ae702d01e21f38a0785d29a75cd6637f (patch) | |
| tree | ebfdaeb0ed3a6c945ceb8e53c907c51a6df17561 | |
| parent | 47de4ee42407c506dad80f10e37c9f3c506a4b00 (diff) | |
| download | awall-02587950ae702d01e21f38a0785d29a75cd6637f.tar.bz2 awall-02587950ae702d01e21f38a0785d29a75cd6637f.tar.xz | |
directory for default JSON files
| -rw-r--r-- | awall/init.lua | 3 | ||||
| -rw-r--r-- | json/masquerade.json (renamed from masquerade.json) | 0 | ||||
| -rw-r--r-- | json/services.json (renamed from services.json) | 0 |
3 files changed, 2 insertions, 1 deletions
diff --git a/awall/init.lua b/awall/init.lua index 3d67630..2f87b37 100644 --- a/awall/init.lua +++ b/awall/init.lua @@ -34,7 +34,8 @@ function translate() config = {} - local confdirs = testmode and {'config'} or {'/usr/share/awall', + local confdirs = testmode and {'json', + 'config'} or {'/usr/share/awall', '/etc/awall'} for i, dir in ipairs(confdirs) do diff --git a/masquerade.json b/json/masquerade.json index 98e2d61..98e2d61 100644 --- a/masquerade.json +++ b/json/masquerade.json diff --git a/services.json b/json/services.json index 78a2003..78a2003 100644 --- a/services.json +++ b/json/services.json |