X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Fparameters;h=e0c8f47996bfec38442cb5d324a9c4e9b550c93f;hb=a671f27ecb900f91bf32b8b13edb678009e319c1;hp=26e2892abe98b4c7d7584139696ef34bfbd00ebc;hpb=7e9d726ccd53626251e56b92c8eec47772bfe0f9;p=matches%2FMCTX3420.git

diff --git a/server/parameters b/server/parameters
index 26e2892..e0c8f47 100644
--- a/server/parameters
+++ b/server/parameters
@@ -17,19 +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="ldaps://ldap.pheme.uwa.edu.au" #UWA
+# (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
+
+#Shadow auth (choose the file location)
 #auth_uri="/etc/shadow"
 #auth_uri="shadow"
 
-# Set to the dn of the LDAP server
-ldap_base_dn="ou=People,dc=daedalus" # Testing
-#ldap_base_dn="ou=Users,ou=UWA,dc=uwads,dc=uwa,dc=edu,dc=au" #UWA
-
+#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;