Merge pull request #23 from M0NWI/master

Add files via upload
cerealkiller1918 · Jun 13, 2017 · a3a2961 · a3a2961
2 parents 36a7092 + 7edb7e2
commit a3a2961
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/bridge.py b/bridge.py
@@ -132,7 +132,7 @@ def build_acl(_sub_acl):
             acl_file.ACL[i] = hex_str_3(acl_file.ACL[i])
         logger.info('ACL file found and ACL entries imported')
         ACL_ACTION = acl_file.ACL_ACTION
-        ACL = acl_file.ACL_ACTION
+        ACL = acl_file.ACL
     except ImportError:
         logger.info('ACL file not found or invalid - all subscriber IDs are valid')
         ACL_ACTION = 'NONE'

diff --git a/mk-dmrlink b/mk-dmrlink
@@ -125,7 +125,7 @@ cp $currentdir/play_group.py /opt/dmrlink/play_group/
 
 # proxy app
 cp $currentdir/dmrlink.py /opt/dmrlink/proxy/
-cp $currentdir/dmrlink_SAMPLE.cfg /opt/dmrlink/rcm/
+cp $currentdir/dmrlink_SAMPLE.cfg /opt/dmrlink/proxy/
 #
 cp $currentdir/proxy.py /opt/dmrlink/proxy/
 cp $currentdir/known_bridges_SAMPLE.py /opt/dmrlink/proxy/