projects
/
weathermon.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Обработка сообщений MQTT в формате rtl_433
[weathermon.git]
/
web
/
config_local.php
diff --git
a/web/config_local.php
b/web/config_local.php
index eef21349d8f264ae1cf2f68aa733d5d38d4be3bd..a4614fdcbf16158f0ec2610676b457bbb72c19de 100644
(file)
--- a/
web/config_local.php
+++ b/
web/config_local.php
@@
-1,17
+1,13
@@
<?php
<?php
- $mysql_host = 'host';
+ $mysql_host = '
db
host';
$mysql_schema = 'meteo';
$mysql_user = 'meteo';
$mysql_schema = 'meteo';
$mysql_user = 'meteo';
- $mysql_pwd = 'somestr
ictpassw
d';
+ $mysql_pwd = 'somestr
onpaswor
d';
$mysql_port = 3306;
setlocale(LC_ALL,'ru_RU.UTF8');
$mysql_port = 3306;
setlocale(LC_ALL,'ru_RU.UTF8');
-<<<<<<< HEAD
-=======
- $valid_ip_start = ip2long('192.168.1.161');
- $valid_ip_end = ip2long('192.168.1.190');
->>>>>>> 438eca78d7802bd2758a4969b80bb0be6b9f14f6
+ $site_header = 'METEO';
-?>
\ No newline at end of file
+?>