X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Fparameters;h=e0c8f47996bfec38442cb5d324a9c4e9b550c93f;hb=HEAD;hp=9f338480eaa47b48ff109b5cf729e297efba9457;hpb=29cdd749c2c6c87a23287a398035a103086aa224;p=matches%2FMCTX3420.git

diff --git a/server/parameters b/server/parameters
index 9f33848..e0c8f47 100644
--- a/server/parameters
+++ b/server/parameters
@@ -17,15 +17,26 @@ LOGDEBUG=4
 verbosity="$LOGDEBUG"
 
 # Set to 1/0 to enable/disable the pin module (gives direct control over GPIO/ADC/PWM)
+#TODO: This option isn't actually implemented yet...
 pin_test="0"
 
 # Set to the URI to use authentication
-auth_uri="ldap://192.168.1.1"
-#auth_uri="/etc/shadow"
+# (Uncomment one of these to enable authentication)
+
+#LDAP auth
+#auth_uri="ldap://192.168.1.1#ou=People,dc=daedalus"
+#auth_uri="ldaps://ldap.pheme.uwa.edu.au#ou=Users,ou=UWA,dc=uwads,dc=uwa,dc=edu,dc=au" #UWA
 
-# Set to the dn of the LDAP server
-ldap_base_dn="ou=People,dc=daedalus"
+#Shadow auth (choose the file location)
+#auth_uri="/etc/shadow"
+#auth_uri="shadow"
 
+#UserCake
+#auth_uri="mysql://localhost#usercake,$(cat mysql_password)"
 
 ## OPTIONS TO BE PASSED TO SERVER; DO NOT EDIT
-parameters="-v $verbosity -p $pin_test -A $auth_uri -d $ldap_base_dn"
+if [ -n "$auth_uri" ]; then
+	parameters="-v $verbosity -p $pin_test -A $auth_uri"
+else
+	parameters="-v $verbosity -p $pin_test"
+fi;