mirror/weewx
1
0
Fork 0
mirror of https://github.com/weewx/weewx.git synced 2026-04-24 19:47:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into wee_import_QC

Browse Source
This commit is contained in:
gjr80
2016-09-07 12:15:20 +10:00
parent a3bf16a3f7 57f62fbd85
commit 7f53a5a0b8
8 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -81,7 +81,7 @@
<li>Support for multiple skins</li>
<li>Support sqlite and MySQL</li>
<li>Optional uploads to Weather Underground, CWOP, AWEKAS, WOW, and others</li>
<li>Uploads to your website via FTP, SFTP, or rsync</li>
<li>Uploads to your website via FTP, FTPS, or rsync</li>
<li>Extensive almanac information</li>
</ul>

7
bin/wee_import
View File

@@ -575,7 +575,7 @@ usage = """wee_import --help
wee_import --version
wee_import --import-config=IMPORT_CONFIG_FILE
[--config=CONFIG_FILE]
[--date YYYY/MM/DD|YYYY/MM/DD hh:mm|YYYY/MM/DD (hh:mm)-YYYY/MM/DD (hh:mm)]
[--date=YYYY/MM/DD|'YYYY/MM/DD hh:mm'|'YYYY/MM/DD (hh:mm)-YYYY/MM/DD (hh:mm)']
[--dry-run]
[--verbose]
[--log=-|LOG_FILE]
@@ -606,10 +606,11 @@ def main():
help="Print what would happen but do not do it.")
parser.add_option("--date", dest="date", type=str, metavar="YYYY-MM-DD",
help="Date or time to import as a string of form "
"'YYYY-MM-DD' or 'YYYY-MM-DD hh:mm'. A date range or "
"YYYY/MM/DD or 'YYYY/MM/DD hh:mm'. A date range or "
"date-time range may be specified by separating two "
"date strings or two date-time strings with a hyphen. "
"Argument must be enclosed in quotation marks.")
"Arguments that include hh:mm must be enclosed in "
"quotation marks.")
parser.add_option("--log", dest="logging", type=str, metavar="LOG_FILE",
help="Control logging of most output. Log output is sent "
"to LOG_FILE if specified. Log output is turned off "

2
bin/weecfg/test/expected/weewx32_expected.conf
View File

@@ -142,7 +142,7 @@ version = 3.2.0
#server = replace with your server name, e.g, www.threefools.org
#path = replace with the destination directory (e.g., /weather)
# Set to True for a secure FTP (SFTP) connection. Not all servers
# Set to True for an FTP over TLS (FTPS) connection. Not all servers
# support this:
secure_ftp = False

2
bin/weecfg/test/expected/weewx_user_expected.conf
View File

@@ -202,7 +202,7 @@ version = 3.2.0a2
#server = replace with the ftp server name, e.g, www.threefools.org
#path = replace with the ftp destination directory (e.g., /weather)
# Set to True for a secure FTP (SFTP) connection. Not all servers
# Set to True for an FTP over TLS (FTPS) connection. Not all servers
# support this.
secure_ftp = False

4
bin/weeutil/ftpupload.py
View File

@@ -47,7 +47,7 @@ class FtpUpload(object):
max_tries: How many times to try creating a directory or uploading
a file before giving up [Optional. Default is 3]
secure: Set to True to attempt a secure FTP (SFTP) session.
secure: Set to True to attempt an FTP over TLS (FTPS) session.
debug: Set to 1 for extra debug information, 0 otherwise.
"""
@@ -73,7 +73,7 @@ class FtpUpload(object):
FTPClass = ftplib.FTP_TLS
except AttributeError:
FTPClass = ftplib.FTP
syslog.syslog(syslog.LOG_DEBUG, "ftpupload: Your version of Python does not support SFTP. Using unsecure connection.")
syslog.syslog(syslog.LOG_DEBUG, "ftpupload: Your version of Python does not support FTPS. Using insecure connection.")
self.secure = False
else:
FTPClass = ftplib.FTP

2
docs/changes.txt
View File

@@ -408,7 +408,7 @@ Fixes ticket #40.
Fixed problem where dumping to database could cause stats to get added to
the daily summaries twice.
Secure FTP (SFTP) sessions are now possible, but don't work very well with
FTP over TLS (FTPS) sessions are now possible, but don't work very well with
Microsoft FTP servers. Requires Python v2.7. Will not work with older
versions of Python. Fixes ticket #37.

4
docs/usersguide.htm
View File

@@ -2452,7 +2452,9 @@ longitude = -77.0366</pre>
<p class="config_important">secure_ftp</p>
<p>Set to <span class="code">True</span> to use a secure FTP (SFTP) connection. Not
<p>Set to <span class="code">True</span> to use FTP (FTPS) over TLS. This is an extension to the FTP
protocol that uses a Secure Socket Layer (SSL) protocol, <em>not</em> to be confused with
SFTP, which uses a Secure Socket Shell protocol. Not
all FTP servers support this. In particular, the Microsoft FTP server seems to do a poor
job of it. Requires Python V2.7. Will not work with older versions of Python.
Optional. Default is <span class="code">False</span></p>

2
weewx.conf
View File

@@ -150,7 +150,7 @@ version = 3.5.0
#server = replace with the ftp server name, e.g, www.threefools.org
#path = replace with the ftp destination directory (e.g., /weather)
# Set to True for a secure FTP (SFTP) connection. Not all servers
# Set to True for an FTP over TLS (FTPS) connection. Not all servers
# support this.
secure_ftp = False