OSDN > Find Software > System > Karesansui > SCM > git > karesansui > Commit

Karesansui
Fork
karesansui
test

karesansui: Commit

Git repository of Karesansui.

Add get data for ssl port number in lighttpd setting

--- a/karesansui/gadget/hostby1settingby1general.py

+++ b/karesansui/gadget/hostby1settingby1general.py

		@@ -147,7 +147,7 @@ def get_view_server_conf(config):
147	147	'uniqkey' : uniqkey,
148	148	'port' : port_number,
149	149	'access' : access_list,
150		- 'ssl_status' : ssl_status,
	150	+ 'ssl_status' : ssl_status["status"],
151	151	}
152	152
153	153	return server_config

--- a/karesansui/lib/file/configfile.py

+++ b/karesansui/lib/file/configfile.py

		@@ -82,10 +82,12 @@ class LighttpdSslConf(LighttpdConfig):
82	82
83	83	def do_read(self, f):
84	84	status = LIGHTTPD_DEFAULT_SSL
	85	+ port_number = None
85	86	lines = f.readlines()
86	87	if lines:
87	88	status = lines[1].split('"')[1]
88		- return status
	89	+ port_number = lines[0].split('==')[1].split('"')[1].split(':')[1]
	90	+ return {"status" : status, "port" : port_number}
89	91
90	92	def do_write(self, f, data):
91	93	conf = env.get('KARESANSUI_CONF')

--- a/karesansui/lib/file/utiles.py

+++ b/karesansui/lib/file/utiles.py

		@@ -39,6 +39,6 @@ def is_ssl():
39	39	ssl_config_file = LighttpdSslConf(file_path)
40	40	ssl_config = ssl_config_file.read()
41	41
42		- return ssl_config == LIGHTTPD_SSL_ON
	42	+ return ssl_config["status"] == LIGHTTPD_SSL_ON
43	43	except Exception:
44	44	raise KaresansuiException(_('Failed to read configuration file -%s') % file_path)