Merge lp:~nextrevision/charms/precise/openvpn-as/trunk into lp:charms/openvpn-as

[John Patterson]

Updated the OpenVPN-AS package version to latest and removed the revision file.

[Marco Ceppi (marcoceppi)]

Hey John! Thanks for submitting this change and continuing to maintain the charm!

While this change looks fine, some new charm policies have been added since this was submitted to the store. Running `juju charm proof` from the charm-tools package (available in ppa:juju/stable) I get the following output:

W: config.yaml: option license does not have the keys: default
W: config.yaml: option fqdn does not have the keys: default

These are very minor and easily corrected warnings. Going forward all configuration options should have a default key, if the default is to be "empty" then just set it to the appropriate empty value for it's type. (IE: default for a string would be ""). Without these defaults, the charm may behave erratically in the juju gui.

Unfortuantely, as these are warnings, this is blocking the merge from being accepted.

Long story short, this LGTM and is a +1 as soon as the proof errors are resolved. As such, I've had to make this as "Needs Fixing", once you've addressed the above please select the "Request another review" button and request a review from "charmers". This will re-add your merge request to our review queue and we'll be able to re-test!

If you have any questions you can always reply here, join us in #juju on freenode.net, ask a question tagged juju on askubuntu.com, or send us an email <email address hidden>

Thanks again for your continued contributions!

review: Needs Fixing

[lp:~nextrevision/charms/precise/openvpn-as/trunk]

8. By John Patterson on 2014-01-16

Updated MD5 for AS package; set default, empty values for all variables

[Marco Ceppi (marcoceppi)]

Thanks for the quick fix! This LGTM +1

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2013-05-22 23:11:55 +0000
+++ config.yaml	2014-01-16 14:59:08 +0000
@@ -2,6 +2,7 @@
   fqdn:
     type: string
     description: FQDN of the server, defaults to unit's private address
+    default: ""
   port:
     type: int
     default: 443
@@ -25,4 +26,5 @@
   license:
     type: string
     description: optional license key acquired from openvpn.net to allow for greater than two clients; see https://openvpn.net/index.php/access-server/license-key.html for more details
+    default: ""
 

=== modified file 'hooks/install'
--- hooks/install	2013-05-22 23:11:55 +0000
+++ hooks/install	2014-01-16 14:59:08 +0000
@@ -4,8 +4,8 @@
 # initially configure without user input. Finally, restart the
 # OpenVPN-AS service.
 
-LURL="http://swupdate.openvpn.org/as/openvpn-as-1.8.5-Ubuntu12.amd_64.deb"
-LHASH="e953fc05ad37bcfa2b01c6ba6cca0d36"
+LURL="http://swupdate.openvpn.org/as/openvpn-as-2.0.3-Ubuntu12.amd_64.deb"
+LHASH="0aa00d02b318548441d5097deb49d8ba"
 
 juju-log "Downloading required components"