From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 13 Feb 2019 23:56:23 +0000 (-0500)
Subject: Add nominal support for Untangle version 14.1.
X-Git-Url: https://gitweb.michael.orlitzky.com/?a=commitdiff_plain;h=a55c225b9dd34e4c28c3e379c701ac8b6887d20f;p=untangle-https-backup.git

Add nominal support for Untangle version 14.1.

Version 14.1 of Untangle is out, but there are no meaningful changes
with respect to the backup process. This commit just mentions the new
version in the docs, and allows specifying "14.1" (the new default) in
the configuration file.
---

diff --git a/doc/man8/untangle-https-backup.8 b/doc/man8/untangle-https-backup.8
index 4842a09..04170df 100644
--- a/doc/man8/untangle-https-backup.8
+++ b/doc/man8/untangle-https-backup.8
@@ -42,10 +42,10 @@ The hostname or IP address where the Untangle web UI is available.
 The Untangle admin username.
 .IP \fBpassword\fR\ (required)
 The Untangle admin password.
-.IP \fBversion\fR\ (default:\ \fI14\fR)
+.IP \fBversion\fR\ (default:\ \fI14.1\fR)
 The major version of Untangle running on this host. Versions \fI9\fR,
-\fI10\fR, \fI11\fR, \fI12\fR, \fI13\fR, \fI13.1\fR, and \fI14\fR are
-supported.
+\fI10\fR, \fI11\fR, \fI12\fR, \fI13\fR, \fI13.1\fR, \fI14\fR, and
+\fI14.1\fR are supported.
 .IP \fBverify_cert\fR\ (default:\ \fIFalse\fR)
 Whether or not to verify the site's SSL certificate, either
 \fITrue\fR or \fIFalse\fR.
diff --git a/src/untangle/untangle.py b/src/untangle/untangle.py
index 6c996a0..570e896 100644
--- a/src/untangle/untangle.py
+++ b/src/untangle/untangle.py
@@ -22,8 +22,9 @@ class Untangle:
         self.base_url = 'https://' + self.host + '/' # This never changes
 
         # Sanity check the numerical version.
-        self.version = s.get('version', '14')
-        if self.version not in ['9', '10', '11', '12', '13', '13.1', '14']:
+        self.version = s.get('version', '14.1')
+        if self.version not in ['9', '10', '11', '12', '13', '13.1',
+                                '14', '14.1']:
             msg =  'Invalid version "' + self.version + '" '
             msg += 'in section "' + s.name + '"'
             raise configparser.ParsingError(msg)
@@ -110,7 +111,7 @@ class Untangle:
         elif self.version in ['10', '11', '12', '13']:
             # The procedure for v11, v12, or v13 is the same as for v10.
             return self.get_backup_v10()
-        elif self.version in  ['13.1', '14']:
+        elif self.version in  ['13.1', '14', '14.1']:
             # But the minor update v13.1 moved the backup URL.
             return self.get_backup_v13_1()
         else: