Merge pull request #316 from juliushaertl/unify-openvpn-settings

openvpn: Rename colour_up/colour_down to color_up/color_down
This commit is contained in:
enkore 2016-02-10 10:57:23 +01:00
commit b99d74d6f6

View File

@ -18,8 +18,8 @@ class OpenVPN(IntervalModule):
""" """
colour_up = "#00ff00" color_up = "#00ff00"
colour_down = "#FF0000" color_down = "#FF0000"
status_up = '' status_up = ''
status_down = '' status_down = ''
format = "{vpn_name} {status}" format = "{vpn_name} {status}"
@ -30,8 +30,8 @@ class OpenVPN(IntervalModule):
settings = ( settings = (
("format", "Format string"), ("format", "Format string"),
("colour_up", "VPN is up"), ("color_up", "VPN is up"),
("colour_down", "VPN is down"), ("color_down", "VPN is down"),
("status_down", "Symbol to display when down"), ("status_down", "Symbol to display when down"),
("status_up", "Symbol to display when up"), ("status_up", "Symbol to display when up"),
("vpn_name", "Name of VPN"), ("vpn_name", "Name of VPN"),
@ -46,10 +46,10 @@ class OpenVPN(IntervalModule):
output = command_result.out.strip() output = command_result.out.strip()
if output == 'active': if output == 'active':
color = self.colour_up color = self.color_up
status = self.status_up status = self.status_up
else: else:
color = self.colour_down color = self.color_down
status = self.status_down status = self.status_down
vpn_name = self.vpn_name vpn_name = self.vpn_name