From d6fa0e89b8235dc5a56fc92c92dc05a0ffe5a874 Mon Sep 17 00:00:00 2001 From: Jeremy Tan Date: Fri, 1 Nov 2013 13:26:53 +0800 Subject: [PATCH 1/1] Make usercake work on marbles --- server/parameters | 15 ++++++++++++--- .../public_html/users/models/db-settings.php | 4 ++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/server/parameters b/server/parameters index a8dc0a0..e0c8f47 100644 --- a/server/parameters +++ b/server/parameters @@ -21,13 +21,22 @@ verbosity="$LOGDEBUG" pin_test="0" # Set to the URI to use authentication +# (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" -#auth_uri="mysql://localhost#root,$(cat mysql_password)" +#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" +if [ -n "$auth_uri" ]; then + parameters="-v $verbosity -p $pin_test -A $auth_uri" +else + parameters="-v $verbosity -p $pin_test" +fi; diff --git a/testing/MCTXWeb/public_html/users/models/db-settings.php b/testing/MCTXWeb/public_html/users/models/db-settings.php index 6d16d17..558efea 100644 --- a/testing/MCTXWeb/public_html/users/models/db-settings.php +++ b/testing/MCTXWeb/public_html/users/models/db-settings.php @@ -7,8 +7,8 @@ http://usercake.com //Database Information $db_host = "localhost"; //Host address (most likely localhost) $db_name = "users"; //Name of Database -$db_user = "root"; //Name of database user -$db_pass = trim(file_get_contents("mysql_password"));// TODO: Create that file or replace this line. +$db_user = "usercake"; //Name of database user +$db_pass = trim(file_get_contents('mysql_password', FILE_USE_INCLUDE_PATH)); $db_table_prefix = "uc_"; -- 2.20.1