From: Jon Langseth Date: Sun, 22 Jan 2012 21:18:52 +0000 (+0100) Subject: Changed database-references, 'provision' is now called 'hermes', reflects that this... X-Git-Url: https://git.defcon.no/?p=hermes;a=commitdiff_plain;h=3b7b5ca848177cc351e0ee623cd9621b7a46eb7b Changed database-references, 'provision' is now called 'hermes', reflects that this API does more than the original phone-provisioning-tool. Also, changed return-data on phone/get and phone/remove --- diff --git a/api/config.php.sample b/api/config.php.sample index 58a26b4..4701355 100644 --- a/api/config.php.sample +++ b/api/config.php.sample @@ -12,10 +12,10 @@ function get_config() 'kamailio_subscriber_table' => 'subscriber', 'kamailio_alias_table' => 'dbaliases', 'kamailio_domain_table' => 'domain', - 'provision_db' => 'provision', - 'provision_users_table' => 'users', - 'provision_phones_table' => 'phones', - 'provision_servers_table' => 'servers', + 'hermes_db' => 'hermes', + 'hermes_users_table' => 'users', + 'hermes_phones_table' => 'phones', + 'hermes_servers_table' => 'servers', 'apikeys_table' => 'apikeys', 'authorizations_table' => 'authorizations', 'sessionkeys_table' => 'sessionkeys', diff --git a/api/lib/auth_base.php b/api/lib/auth_base.php index e2ed932..3e9d8da 100644 --- a/api/lib/auth_base.php +++ b/api/lib/auth_base.php @@ -112,7 +112,7 @@ function expire_authkeys() $query = sprintf("SELECT session, sessid FROM %s WHERE `last` < DATE_SUB( NOW(), INTERVAL %d MINUTE)", $config['sessionkeys_table'], $config['sessionkey_lifetime']); - $result = sql_dbquery( $config['provision_db'], $query ); + $result = sql_dbquery( $config['hermes_db'], $query ); while ( $row = @mysql_fetch_row( $result ) ) { remove_session( $row[0], $row[1] ); @@ -122,7 +122,7 @@ function expire_authkeys() $config['sessionkeys_table'], $config['sessionkey_lifetime']); - sql_dbexec( $config['provision_db'], $query ); + sql_dbexec( $config['hermes_db'], $query ); } function update_authkey ( $session, $authid ) @@ -146,7 +146,7 @@ function update_authkey ( $session, $authid ) sql_clean($remote), sql_clean($key), sql_clean($key)); - if ( ! sql_dbexec( $config['provision_db'], $query ) ) + if ( ! sql_dbexec( $config['hermes_db'], $query ) ) { mysql_error(); } @@ -214,7 +214,7 @@ function clear_credentials($name) $query = sprintf("DELETE FROM %s WHERE `session` = '%s'", $config['sessionkeys_table'], sql_clean($name)); - sql_dbexec( $config['provision_db'], $query ); + sql_dbexec( $config['hermes_db'], $query ); return false; } @@ -259,7 +259,7 @@ function add_apikey ( $host, $level ) sql_clean($host), sql_clean($key)); - if ( ! sql_dbexec( $config['provision_db'], $query ) ) return false; + if ( ! sql_dbexec( $config['hermes_db'], $query ) ) return false; return $key; } @@ -272,7 +272,7 @@ function remove_apikey( $key ) $query = sprintf("DELETE FROM %s WHERE apikey = '%s'", $config['apikeys_table'], sql_clean($key) ); - if ( ! sql_dbexec( $config['provision_db'], $query ) ) return false; + if ( ! sql_dbexec( $config['hermes_db'], $query ) ) return false; return true; } @@ -284,7 +284,7 @@ function verify_apikey( $key, $skip_hostcheck = false ) $query = sprintf("SELECT host FROM %s WHERE apikey = '%s'", $config['apikeys_table'], sql_clean($key) ); - $row = sql_dbquery_single( $config['provision_db'], $query ); + $row = sql_dbquery_single( $config['hermes_db'], $query ); if (!$row) return false; $host = $row['host']; @@ -306,7 +306,7 @@ function list_apikeys () $config['apikeys_table'], $config['authorizations_table']); $list = array(); - $result = sql_dbquery( $config['provision_db'], $query); + $result = sql_dbquery( $config['hermes_db'], $query); if ( ! $result ) return $list; while ( $row = @mysql_fetch_assoc( $result ) ) { @@ -328,7 +328,7 @@ function list_authusers () WHERE type = 'user'", $config['authorizations_table']); $list = array(); - $result = sql_dbquery( $config['provision_db'], $query); + $result = sql_dbquery( $config['hermes_db'], $query); if ( ! $result ) return $list; while ( $row = @mysql_fetch_assoc( $result ) ) { @@ -363,7 +363,7 @@ function update_authorization( $type, $authid, $level ) sql_clean($authid), $type, $level, $level); - if ( ! sql_dbexec( $config['provision_db'], $query ) ) return false; + if ( ! sql_dbexec( $config['hermes_db'], $query ) ) return false; return true; } @@ -374,7 +374,7 @@ function remove_authorization( $authid ) $config['authorizations_table'], sql_clean($authid) ); //print $query . "\n\n"; - if ( ! sql_dbexec( $config['provision_db'], $query ) ) return false; + if ( ! sql_dbexec( $config['hermes_db'], $query ) ) return false; return true; } @@ -398,7 +398,7 @@ function get_authorization( $type, $authid ) $query = sprintf("SELECT access_level FROM %s WHERE authid = '%s'", $config['authorizations_table'], sql_clean($authid) ); - $row = sql_dbquery_single( $config['provision_db'], $query ); + $row = sql_dbquery_single( $config['hermes_db'], $query ); if (!$row) return false; $level = $row['access_level']; return $level; diff --git a/api/lib/common_functions.php b/api/lib/common_functions.php index df76b57..7baccb3 100644 --- a/api/lib/common_functions.php +++ b/api/lib/common_functions.php @@ -23,9 +23,9 @@ function get_servers( $domain ) { global $config; $query = sprintf("SELECT registrar, r_port, proxy, p_port, prov_url FROM %s WHERE domain = '%s'", - $config['provision_servers_table'], + $config['hermes_servers_table'], sql_clean( $domain )); - $servers = sql_dbquery_single( $config['provision_db'], $query ); + $servers = sql_dbquery_single( $config['hermes_db'], $query ); return $servers; } diff --git a/api/lib/domain_functions.php b/api/lib/domain_functions.php index 74095b8..98fb370 100644 --- a/api/lib/domain_functions.php +++ b/api/lib/domain_functions.php @@ -31,7 +31,7 @@ function set_servers ( $domain, $registrar, $r_port, $proxy, $p_port, $prov_url proxy = '%s', p_port = %d, prov_url = '%s' WHERE domain = '%s'", - $config['provision_servers_table'], + $config['hermes_servers_table'], sql_clean($registrar), $r_port, sql_clean($proxy), @@ -45,7 +45,7 @@ function set_servers ( $domain, $registrar, $r_port, $proxy, $p_port, $prov_url $query = sprintf("INSERT INTO %s (domain, registrar, r_port, proxy, p_port, prov_url) VALUES ('%s', '%s', %d, '%s', %d, '%s')", - $config['provision_servers_table'], + $config['hermes_servers_table'], sql_clean($domain), sql_clean($registrar), $r_port, @@ -55,6 +55,6 @@ function set_servers ( $domain, $registrar, $r_port, $proxy, $p_port, $prov_url ); } - return sql_dbexec( $config['provision_db'], $query ); + return sql_dbexec( $config['hermes_db'], $query ); } ?> diff --git a/api/lib/number_functions.php b/api/lib/number_functions.php index 3ddf159..661f9d8 100644 --- a/api/lib/number_functions.php +++ b/api/lib/number_functions.php @@ -37,7 +37,7 @@ function number_inpool( $number ) } $test = "SELECT COUNT(*) FROM " . $config['numbers_table'] . " WHERE number = '" . $number . "'"; - $result = sql_dbquery($config['provision_db'], $test); + $result = sql_dbquery($config['hermes_db'], $test); if ( !$result ) return false; $row = @mysql_fetch_row($result); if ( !$row ) return false; @@ -53,7 +53,7 @@ function get_random_numbers ( $limit = 0 ) $query = "SELECT number FROM " . $config['numbers_table'] . " ORDER BY RAND()"; if ( $limit && is_numeric( $limit ) ) $query .= " LIMIT " . $limit; - $result = sql_dbquery( $config['provision_db'], $query ); + $result = sql_dbquery( $config['hermes_db'], $query ); if ( !$result ) return null; if ( @mysql_num_rows($result) < 1 ) return null; @@ -80,7 +80,7 @@ function get_numbers ( $search=null, $limit = 0 ) $query .= " LIMIT " . $limit; - $result = sql_dbquery( $config['provision_db'], $query ); + $result = sql_dbquery( $config['hermes_db'], $query ); if ( !$result ) return null; if ( @mysql_num_rows($result) < 1 ) return null; @@ -137,7 +137,7 @@ function add_number( $number ) if (number_inpool( $number ) ) return false; $insert = "INSERT INTO " . $config['numbers_table'] . " (number) VALUES ('" . $number . "')"; - return sql_dbexec( $config['provision_db'], $insert); + return sql_dbexec( $config['hermes_db'], $insert); } function remove_number ( $number ) @@ -149,7 +149,7 @@ function remove_number ( $number ) } if ( !number_inpool( $number ) ) return false; $query = "DELETE FROM " . $config['numbers_table'] . " WHERE number = '" . $number . "'"; - return sql_dbexec( $config['provision_db'], $query); + return sql_dbexec( $config['hermes_db'], $query); } ?> diff --git a/api/lib/phone_functions.php b/api/lib/phone_functions.php index e527aea..9f05ac5 100644 --- a/api/lib/phone_functions.php +++ b/api/lib/phone_functions.php @@ -7,21 +7,21 @@ function get_user_phones ( $username, $domain ) { global $config; $query = sprintf("SELECT id FROM %s WHERE username = '%s' AND domain = '%s'", - $config['provision_users_table'], + $config['hermes_users_table'], sql_clean( $username ), sql_clean( $domain ) ); - $user = sql_dbquery_single( $config['provision_db'], $query ); + $user = sql_dbquery_single( $config['hermes_db'], $query ); if ( ! $user ) return null; $user_id = $user['id']; $query = sprintf("SELECT mac FROM %s WHERE user_rel = %d", - $config['provision_phones_table'], + $config['hermes_phones_table'], $user_id ); - $result = sql_dbquery( $config['provision_db'], $query ); + $result = sql_dbquery( $config['hermes_db'], $query ); if ( !$result ) return null; if ( @mysql_num_rows($result) < 1 ) return null; $rows = array(); @@ -33,14 +33,14 @@ function get_user_phones ( $username, $domain ) function get_phone_users ( $macaddress ) { global $config; - $ptbl = $config['provision_phones_table']; - $utbl = $config['provision_users_table']; + $ptbl = $config['hermes_phones_table']; + $utbl = $config['hermes_users_table']; $query = "SELECT ".$ptbl.".mac as mac, CONCAT( ".$utbl.".username, '@', ".$utbl.".domain ) as user FROM ".$ptbl." INNER JOIN ".$utbl." ON ".$ptbl.".user_rel = ".$utbl.".id WHERE ".$ptbl.".mac = '".sql_clean($macaddress ). "'"; - $result = sql_dbquery( $config['provision_db'], $query ); + $result = sql_dbquery( $config['hermes_db'], $query ); if ( !$result ) return null; if ( @mysql_num_rows($result) < 1 ) return null; $rows = array(); @@ -70,8 +70,8 @@ function add_phone_user( $mac, $username, $domain ) // OK, so we have the User ID, a valid MAC, and no previous registration // of that combination. Going to add. $query = sprintf("INSERT INTO %s ( mac, user_rel ) VALUES ( '%s', %d )", - $config['provision_phones_table'], $mac, $user_id); - return sql_dbexec( $config['provision_db'], $query ); + $config['hermes_phones_table'], $mac, $user_id); + return sql_dbexec( $config['hermes_db'], $query ); } function delete_phone_user( $mac, $username, $domain ) @@ -93,8 +93,8 @@ function delete_phone_user( $mac, $username, $domain ) // OK, so we have the User ID, a valid MAC, and no previous registration // of that combination. Going to remove. $query = sprintf("DELETE FROM %s WHERE mac = '%s' AND user_rel = %d", - $config['provision_phones_table'], $mac, $user_id); - return sql_dbexec( $config['provision_db'], $query ); + $config['hermes_phones_table'], $mac, $user_id); + return sql_dbexec( $config['hermes_db'], $query ); } @@ -102,11 +102,11 @@ function delete_phone_user( $mac, $username, $domain ) function list_phones ( $search = null ) { global $config; - $query = sprintf("SELECT mac FROM %s", $config['provision_phones_table']); + $query = sprintf("SELECT mac FROM %s", $config['hermes_phones_table']); if ( $search ) $query .= sprintf(" WHERE mac LIKE '%s%%'", sql_clean($search)); - $result = sql_dbquery( $config['provision_db'], $query ); + $result = sql_dbquery( $config['hermes_db'], $query ); if ( !$result ) return null; if ( @mysql_num_rows($result) < 1 ) return null; $rows = array(); diff --git a/api/lib/user_functions.php b/api/lib/user_functions.php index a1a9b0c..f1e660b 100644 --- a/api/lib/user_functions.php +++ b/api/lib/user_functions.php @@ -35,11 +35,11 @@ function is_provision_user ( $user, $domain ) { global $config; $query = sprintf("SELECT username FROM %s WHERE username = '%s' AND domain = '%s'", - $config['provision_users_table'], + $config['hermes_users_table'], sql_clean( $user ), sql_clean( $domain ) ); - return sql_dbtest_numrows( $config['provision_db'], $query, 1); + return sql_dbtest_numrows( $config['hermes_db'], $query, 1); } function add_kamailio_subscriber( $username, $domain, $password, $email ) @@ -132,7 +132,7 @@ function add_provision_user( $username, $password, $domain, $authid, $registrar, if ( is_provision_user( $username, $password ) ) return false; $query = sprintf ("INSERT INTO %s ( username, password, displayname, domain, registrar, r_port, proxy, p_port, dialplan, authid, linetext ) VALUES ('%s', '%s', '%s', '%s', '%s', %d, '%s', %d, '%s', '%s', '%s')", - $config['provision_users_table'], + $config['hermes_users_table'], sql_clean($username), sql_clean($password), sql_clean($displayname), @@ -145,7 +145,7 @@ function add_provision_user( $username, $password, $domain, $authid, $registrar, sql_clean($authid), sql_clean($linetext) ); - if ( ! sql_dbexec( $config['provision_db'], $query ) ) return false; + if ( ! sql_dbexec( $config['hermes_db'], $query ) ) return false; return true; } function get_provision_userid ( $username, $domain ) @@ -153,12 +153,12 @@ function get_provision_userid ( $username, $domain ) global $config; $query = sprintf("SELECT id FROM %s WHERE username = '%s' AND domain = '%s'", - $config['provision_users_table'], + $config['hermes_users_table'], sql_clean($username), sql_clean($domain) ); - $row = sql_dbquery_single( $config['provision_db'], $query ); + $row = sql_dbquery_single( $config['hermes_db'], $query ); if (!$row) return false; $user_rowid = $row['id']; return $user_rowid; @@ -172,12 +172,12 @@ function delete_provision_user( $username, $domain ) if ( !$user_rowid ) return false; $query = sprintf( "DELETE FROM %s WHERE id = %d AND username = '%s' AND domain = '%s'", - $config['provision_users_table'], + $config['hermes_users_table'], $user_rowid, sql_clean($username), sql_clean($domain) ); - if ( sql_dbexec_rows( $config['provision_db'], $query) != 1 ) return false; + if ( sql_dbexec_rows( $config['hermes_db'], $query) != 1 ) return false; return true; } @@ -203,14 +203,14 @@ function update_provision_data ( $param, $username, $domain, $data ) return -2; $query = sprintf("UPDATE %s SET %s = '%s' WHERE username = '%s' AND domain = '%s'", - $config['provision_users_table'], + $config['hermes_users_table'], sql_clean($param), sql_clean($data), sql_clean($username), sql_clean($domain) ); - $res = sql_dbexec_rows( $config['provision_db'], $query); + $res = sql_dbexec_rows( $config['hermes_db'], $query); if ( $res < 0 ) return -2; if ( $res > 1 ) return -2; @@ -225,28 +225,28 @@ function update_provision_pw ( $username, $domain, $password ) return false; $query = sprintf("UPDATE %s SET password = '%s' WHERE username = '%s' AND domain = '%s'", - $config['provision_users_table'], + $config['hermes_users_table'], sql_clean($password), sql_clean($username), sql_clean($domain) ); - if ( sql_dbexec_rows( $config['provision_db'], $query) != 1 ) return false; + if ( sql_dbexec_rows( $config['hermes_db'], $query) != 1 ) return false; return true; } function list_users ( $search = null ) { global $config; - $query = sprintf("SELECT CONCAT(username, '@', domain), displayname FROM %s ORDER BY username,domain", $config['provision_users_table'] ); + $query = sprintf("SELECT CONCAT(username, '@', domain), displayname FROM %s ORDER BY username,domain", $config['hermes_users_table'] ); if ( array_key_exists ( 'search', $_POST ) ) { $search = $_POST['search']; // TODO: Add some sanitation and input validation! - $query = sprintf("SELECT CONCAT(username, '@', domain) FROM %s WHERE CONCAT(username, '@', domain) LIKE '%%%s%%' ORDER BY username,domain", $config['provision_users_table'], sql_clean( $search ) ); + $query = sprintf("SELECT CONCAT(username, '@', domain) FROM %s WHERE CONCAT(username, '@', domain) LIKE '%%%s%%' ORDER BY username,domain", $config['hermes_users_table'], sql_clean( $search ) ); } - $result = sql_dbquery( $config['provision_db'], $query ); + $result = sql_dbquery( $config['hermes_db'], $query ); if ( !$result ) return null; $list = array(); while ( $row = @mysql_fetch_row( $result ) ) @@ -270,11 +270,11 @@ function get_userdata( $username, $domain ) $kamailio_data = null; $query_provision = sprintf ("SELECT id, username, password, displayname, domain, registrar, r_port, proxy, p_port, dialplan, authid, linetext FROM %s WHERE username = '%s' AND domain = '%s'", - $config['provision_users_table'], + $config['hermes_users_table'], sql_clean($username), sql_clean($domain)); - $provision_data = sql_dbquery_single( $config['provision_db'] , $query_provision ); + $provision_data = sql_dbquery_single( $config['hermes_db'] , $query_provision ); if ( ! $provision_data ) return false; if ( $type == 'local' ) diff --git a/api/phone.php b/api/phone.php index 12ae057..3a38a4b 100644 --- a/api/phone.php +++ b/api/phone.php @@ -136,8 +136,7 @@ token_auth(); } else { - print json_encode( array ( 'response' => 'ok', 'data' => array ( - 'mac' => $mac, 'username' => $username, 'domain' => $domain) )); + print json_encode( array ( 'response' => 'ok', 'mac' => $mac, 'username' => $username, 'domain' => $domain) ); break; } break; @@ -201,7 +200,7 @@ token_auth(); } else { - print json_encode( array ( 'response' => 'ok' )); + print json_encode( array ( 'response' => 'ok', 'mac' => $mac, 'username' => $username, 'domain' => $domain )); break; } break; diff --git a/api/user.php b/api/user.php index c5926bc..0dcd23c 100644 --- a/api/user.php +++ b/api/user.php @@ -52,9 +52,9 @@ token_auth(); // Now, do funky stuff. /* - Test if user exists in both 'kamailio.subscribers' and 'provision.users' + Test if user exists in both 'kamailio.subscribers' and 'hermes.users' * Return 'response' => 'ok', 'type' => 'local', 'user' => complete user object. - Test if user exists in 'provision.user' only + Test if user exists in 'hermes.user' only * Return 'response' => 'ok', 'type' => 'remote', 'user' => complete user object. If user does is neither local nor remote * Return 'response' => 'failed' with 'cause' => 'nonexistant' @@ -101,20 +101,20 @@ token_auth(); email Verify that domain is local (lookup in the 'kamailio.domain' table. - Verify that the username is available (nonexistant for domain in kamilio.subscribers (and provision.users?)) + Verify that the username is available (nonexistant for domain in kamilio.subscribers (and hermes.users?)) * Autocreate password * Add username, domain, email and created password to the 'kamailio.subscriber' table - * Get the registrar+port, proxy+port from the 'provision.servers' table. + * Get the registrar+port, proxy+port from the 'hermes.servers' table. * standard dialplan from configuration. - * Add to the 'provision.users' table: + * Add to the 'hermes.users' table: username -> username password -> generated password displayname -> displayname domain -> domain - registrar -> provision.servers.registrar - r_port -> provision.servers.r_port - proxy -> provision.servers.proxy - p_port -> provision.servers.p_port + registrar -> hermes.servers.registrar + r_port -> hermes.servers.r_port + proxy -> hermes.servers.proxy + p_port -> hermes.servers.p_port authid -> username dialplan -> standard dialplan linetext -> username @@ -232,13 +232,13 @@ token_auth(); linetext Verify that the domain is not a local kamailio domain (REMOTE user..) - Verify that the username+domain is not already registered in 'provision.users'. + Verify that the username+domain is not already registered in 'hermes.users'. * If r_port is empty, set to 5060 * If proxy/port is empty, set to registrar/port * If authid is empty, set to username * If dialplan is empty, set to standard dialplan * If linetext is empty, set to username@domain - * Add to the 'provision.users' table: + * Add to the 'hermes.users' table: username -> username password -> supplied password displayname -> displayname @@ -342,9 +342,9 @@ token_auth(); Required parameters should be... ( username & domain ) | user - * Verify that no associations/relations exist in 'provision.phones' - * Verify that the user exists in 'provision.users' - * Remove from 'provision.users' + * Verify that no associations/relations exist in 'hermes.phones' + * Verify that the user exists in 'hermes.users' + * Remove from 'hermes.users' * Test to see of user exists in 'kamailio.subscriber'. * Remove from 'kamailio.subscribers' * Return response' => 'ok', 'type' => 'local' @@ -405,12 +405,12 @@ token_auth(); ( username & domain ) | user password - * Verify that no associations/relations exist in 'provision.phones' + * Verify that no associations/relations exist in 'hermes.phones' * Verify that the user exists ... - * Test to see of user exists in 'provision.users' + * Test to see of user exists in 'hermes.users' * Test to see of user exists in 'kamailio.subscriber'. * If no such user exists, return 'response' => 'failed' with 'cause' => 'nonexistant' - * Update user passwords in 'provision' and 'kamailio' as appropriate + * Update user passwords in 'hermes' and 'kamailio' as appropriate * On other failures, return 'response' => 'failed' with 'cause' => 'error' (may set 'detail' => 'message') */ if ( array_key_exists('password', $_POST) && @@ -530,9 +530,9 @@ token_auth(); Required parameters should be... ( username & domain ) | user - * Verify that no associations/relations exist in 'provision.phones' + * Verify that no associations/relations exist in 'hermes.phones' * Verify that the user exists ... - * Test to see of user exists in 'provision.users' + * Test to see of user exists in 'hermes.users' * Test to see of user exists in 'kamailio.subscriber'. * If no such user exists, return 'response' => 'failed' with 'cause' => 'nonexistant' * Get update parameters, and change as appropriate ;) diff --git a/doc/api-nodes.txt b/doc/api-nodes.txt index 03b82b6..cb6ea9a 100644 --- a/doc/api-nodes.txt +++ b/doc/api-nodes.txt @@ -449,7 +449,9 @@ phone/list a subset matching on the MAC addresses. Return: - TODO: Document this. + Returns 'list' as a simple array of registered MAC-adresses on success, + the list will be limited to addresses matching the search if provided. + phone/add ------------------- @@ -483,7 +485,7 @@ phone/remove are identical to the phone/add node. Return: - TODO: Document additional info provided on 'result' = 'ok' + Returns 'mac', 'username' and 'domain' on success. Returns 'failed' with 'cause' = 'invalid' if SIP address is malformed. Returns 'failed' with 'cause' = 'invalid' if MAC address is malformed. Returns 'failed' with 'cause' = 'nonexistant' on no such registration. diff --git a/doc/sql-data/sample-data.sql b/doc/sql-data/sample-data.sql index 8794d41..722d16d 100644 --- a/doc/sql-data/sample-data.sql +++ b/doc/sql-data/sample-data.sql @@ -440,10 +440,10 @@ LOCK TABLES `xcap` WRITE; UNLOCK TABLES; -- --- Current Database: `provision` +-- Current Database: `hermes` -- -USE `provision`; +USE `hermes`; -- -- Dumping data for table `number_pool` diff --git a/doc/sql-data/structure.sql b/doc/sql-data/structure.sql index b4555a1..bd7f96e 100644 --- a/doc/sql-data/structure.sql +++ b/doc/sql-data/structure.sql @@ -1016,12 +1016,12 @@ CREATE TABLE `xcap` ( SET character_set_client = @saved_cs_client; -- --- Current Database: `provision` +-- Current Database: `hermes` -- -CREATE DATABASE /*!32312 IF NOT EXISTS*/ `provision` /*!40100 DEFAULT CHARACTER SET latin1 */; +CREATE DATABASE /*!32312 IF NOT EXISTS*/ `hermes` /*!40100 DEFAULT CHARACTER SET latin1 */; -USE `provision`; +USE `hermes`; -- -- Table structure for table `apikeys`