Skip to content
Snippets Groups Projects
Commit 15bf186b authored by John Hodge's avatar John Hodge
Browse files

Updated config locations for new machine (and MIFARE serial port)

parent b513a539
Branches
Tags
No related merge requests found
...@@ -13,7 +13,7 @@ def get_ldap_connection(): ...@@ -13,7 +13,7 @@ def get_ldap_connection():
conn = ldap.initialize('ldaps://mussel.ucc.gu.uwa.edu.au/') conn = ldap.initialize('ldaps://mussel.ucc.gu.uwa.edu.au/')
binddn = 'cn=mifareagent,ou=profile,dc=ucc,dc=gu,dc=uwa,dc=edu,dc=au' binddn = 'cn=mifareagent,ou=profile,dc=ucc,dc=gu,dc=uwa,dc=edu,dc=au'
passfile = open('/etc/dispense/ldap.passwd') passfile = open('/etc/dispense2/ldap.passwd')
password = passfile.readline().strip() password = passfile.readline().strip()
passfile.close() passfile.close()
......
...@@ -4,7 +4,7 @@ from LDAPConnector import get_uid, set_card_id ...@@ -4,7 +4,7 @@ from LDAPConnector import get_uid, set_card_id
class MIFAREClient: class MIFAREClient:
def __init__(self): def __init__(self):
self.port = Serial('/dev/ttyS0', baudrate = 19200) self.port = Serial('/dev/ttyS2', baudrate = 19200)
self.reader = MIFAREReader(self.port) self.reader = MIFAREReader(self.port)
self.reader.set_led(red = False, green = True) self.reader.set_led(red = False, green = True)
self.reader.beep(100) self.reader.beep(100)
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
class VendingException( Exception ): pass class VendingException( Exception ): pass
FILENAME="/etc/dispense/snacks.conf" FILENAME="/etc/dispense2/snacks.conf"
def parse_line( l ): def parse_line( l ):
toks = l.strip().split() toks = l.strip().split()
......
...@@ -941,7 +941,7 @@ def parse_args(): ...@@ -941,7 +941,7 @@ def parse_args():
from optparse import OptionParser from optparse import OptionParser
op = OptionParser(usage="%prog [OPTION]...") op = OptionParser(usage="%prog [OPTION]...")
op.add_option('-f', '--config-file', default='/etc/dispense/servers.conf', metavar='FILE', dest='config_file', help='use the specified config file instead of /etc/dispense/servers.conf') op.add_option('-f', '--config-file', default='/etc/dispense2/servers.conf', metavar='FILE', dest='config_file', help='use the specified config file instead of /etc/dispense/servers.conf')
op.add_option('--serial', action='store_true', default=True, dest='use_serial', help='use the serial port') op.add_option('--serial', action='store_true', default=True, dest='use_serial', help='use the serial port')
op.add_option('--lat', action='store_true', default=False, dest='use_lat', help='use LAT') op.add_option('--lat', action='store_true', default=False, dest='use_lat', help='use LAT')
op.add_option('--virtualvend', action='store_false', default=True, dest='use_serial', help='use the virtual vending server instead of LAT') op.add_option('--virtualvend', action='store_false', default=True, dest='use_serial', help='use the virtual vending server instead of LAT')
......
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