OSDN -- Develop and Download Open Source Software
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

karesansui: Commit

Git repository of Karesansui.


Commit MetaInfo

Revision65c24944bee81a0044bce38f72307f1844ff4aa7 (tree)
Time2011-01-05 12:35:47
Authorkeisuke fukawa <keisuke@kare...>
Commiterkeisuke fukawa

Log Message

Add SSL port number change method.

Change Summary

Incremental Difference

--- a/doc/messages.pot
+++ b/doc/messages.pot
@@ -1,14 +1,14 @@
11 # Translations template for PROJECT.
2-# Copyright (C) 2010 ORGANIZATION
2+# Copyright (C) 2011 ORGANIZATION
33 # This file is distributed under the same license as the PROJECT project.
4-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
4+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
55 #
66 #, fuzzy
77 msgid ""
88 msgstr ""
99 "Project-Id-Version: PROJECT VERSION\n"
1010 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
11-"POT-Creation-Date: 2010-12-06 16:32+0900\n"
11+"POT-Creation-Date: 2011-01-05 12:32+0900\n"
1212 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2222,7 +2222,7 @@ msgstr ""
22222222 #: /git/karesansui/karesansui/templates/default/hostby1networkstorageby1/hostby1networkstorageby1.input:141
22232223 #: /git/karesansui/karesansui/templates/default/hostby1networkstorageby1/hostby1networkstorageby1.part:79
22242224 #: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:51
2225-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:129
2225+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:148
22262226 #: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.part:36
22272227 #: /git/karesansui/karesansui/templates/default/hostby1settingby1mail/hostby1settingby1mail.input:22
22282228 #: /git/karesansui/karesansui/templates/default/hostby1settingby1mail/hostby1settingby1mail.input:47
@@ -2245,8 +2245,8 @@ msgstr ""
22452245 #: /git/karesansui/karesansui/templates/default/guest/guest.part:253
22462246 #: /git/karesansui/karesansui/templates/default/host/host.input:122
22472247 #: /git/karesansui/karesansui/templates/default/host/host.input:148
2248-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:125
2249-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:158
2248+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:144
2249+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:180
22502250 #: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.part:29
22512251 #: /git/karesansui/karesansui/templates/default/job/job.html:6
22522252 #: /git/karesansui/karesansui/templates/default/jobby1/jobby1.part:47
@@ -2692,14 +2692,14 @@ msgid "Action Status"
26922692 msgstr ""
26932693
26942694 #: /git/karesansui/karesansui/gadget/hostby1settingby1general.py:75
2695-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:137
2696-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:168
2695+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:156
2696+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:190
26972697 #: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.part:43
26982698 msgid "Access Policy"
26992699 msgstr ""
27002700
27012701 #: /git/karesansui/karesansui/gadget/hostby1settingby1general.py:83
2702-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:173
2702+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:195
27032703 #: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.part:9
27042704 msgid "Permit access from same network"
27052705 msgstr ""
@@ -2712,7 +2712,7 @@ msgstr ""
27122712 #: /git/karesansui/karesansui/gadget/hostby1settingby1general.py:94
27132713 #: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:67
27142714 #: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:78
2715-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:175
2715+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:197
27162716 msgid "Permit access from specified IP address"
27172717 msgstr ""
27182718
@@ -2722,11 +2722,19 @@ msgid "Permit specified IP address"
27222722 msgstr ""
27232723
27242724 #: /git/karesansui/karesansui/gadget/hostby1settingby1general.py:113
2725-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:141
2726-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:180
2725+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:160
2726+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:202
27272727 msgid "SSL Settings"
27282728 msgstr ""
27292729
2730+#: /git/karesansui/karesansui/gadget/hostby1settingby1general.py:117
2731+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:89
2732+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:164
2733+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:211
2734+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.part:65
2735+msgid "SSL Port Number"
2736+msgstr ""
2737+
27302738 #: /git/karesansui/karesansui/gadget/hostby1settingby1mail.py:37
27312739 #: /git/karesansui/karesansui/gadget/hostby1settingby1mail.py:39
27322740 #: /git/karesansui/karesansui/gadget/hostby1settingby1mail.py:43
@@ -4261,7 +4269,7 @@ msgstr ""
42614269 #: /git/karesansui/karesansui/templates/default/hostby1networkstorageby1/hostby1networkstorageby1.input:45
42624270 #: /git/karesansui/karesansui/templates/default/hostby1report/hostby1report.part:32
42634271 #: /git/karesansui/karesansui/templates/default/hostby1reportby1/hostby1reportby1.part:55
4264-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:86
4272+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:96
42654273 #: /git/karesansui/karesansui/templates/default/hostby1settingby1mail/hostby1settingby1mail.input:28
42664274 #: /git/karesansui/karesansui/templates/default/hostby1settingby1ntp/hostby1settingby1ntp.input:28
42674275 #: /git/karesansui/karesansui/templates/default/hostby1settingby1proxy/hostby1settingby1proxy.input:53
@@ -4542,10 +4550,11 @@ msgstr ""
45424550 #: /git/karesansui/karesansui/templates/default/hostby1networkstorage/hostby1networkstorage.input:151
45434551 #: /git/karesansui/karesansui/templates/default/hostby1networkstorageby1/hostby1networkstorageby1.input:163
45444552 #: /git/karesansui/karesansui/templates/default/hostby1networkstorageby1/hostby1networkstorageby1.input:169
4545-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:160
4546-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:165
4547-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:176
4548-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:177
4553+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:182
4554+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:187
4555+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:198
4556+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:199
4557+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:213
45494558 #: /git/karesansui/karesansui/templates/default/hostby1settingby1mail/hostby1settingby1mail.input:68
45504559 #: /git/karesansui/karesansui/templates/default/hostby1settingby1mail/hostby1settingby1mail.input:73
45514560 #: /git/karesansui/karesansui/templates/default/hostby1settingby1ntp/hostby1settingby1ntp.input:55
@@ -5008,7 +5017,7 @@ msgstr ""
50085017 #: /git/karesansui/karesansui/templates/default/hostby1networksettings/hostby1networksettings.part:144
50095018 #: /git/karesansui/karesansui/templates/default/hostby1networkstorage/hostby1networkstorage.part:192
50105019 #: /git/karesansui/karesansui/templates/default/hostby1networkstorageby1/hostby1networkstorageby1.input:187
5011-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:188
5020+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:219
50125021 #: /git/karesansui/karesansui/templates/default/hostby1settingby1mail/hostby1settingby1mail.input:81
50135022 #: /git/karesansui/karesansui/templates/default/hostby1settingby1proxy/hostby1settingby1proxy.input:146
50145023 #: /git/karesansui/karesansui/templates/default/hostby1staticrouteby1/hostby1staticrouteby1.input:115
@@ -5637,7 +5646,7 @@ msgid ""
56375646 msgstr ""
56385647
56395648 #: /git/karesansui/karesansui/templates/default/host/host.input:123
5640-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:126
5649+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:145
56415650 msgid ""
56425651 "A unique ID to distinguish each host when using Karesansui in multi-host "
56435652 "configuration. Should be a unique value between all hosts and guests. "
@@ -6508,11 +6517,11 @@ msgstr ""
65086517 msgid "NTP Settings"
65096518 msgstr ""
65106519
6511-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:134
6520+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:153
65126521 msgid "A listen port number for Karesansui web control panel."
65136522 msgstr ""
65146523
6515-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:138
6524+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:157
65166525 msgid ""
65176526 "Access policy for Karesansui control panel. You may allow access from "
65186527 "specified IP address or network. To \\\"Permit access from same "
@@ -6522,24 +6531,28 @@ msgid ""
65226531 "restart lighttpd via .\\\"Management\\\" - \\\"Service\\\" panel."
65236532 msgstr ""
65246533
6525-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:142
6534+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:161
65266535 msgid "Settings to enable/disable SSL for Karesansui control panel."
65276536 msgstr ""
65286537
6529-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:152
6538+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:165
6539+msgid "A listen port number of SSL for Karesansui control panel."
6540+msgstr ""
6541+
6542+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:174
65306543 msgid "Edit Server Settings"
65316544 msgstr ""
65326545
6533-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:163
6546+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:185
65346547 msgid "Karesansui Port Number"
65356548 msgstr ""
65366549
6537-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:171
6550+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:193
65386551 #: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.part:16
65396552 msgid "Permit access from all"
65406553 msgstr ""
65416554
6542-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:182
6555+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:205
65436556 #: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.part:19
65446557 #: /git/karesansui/karesansui/templates/default/hostby1settingby1proxy/hostby1settingby1proxy.input:7
65456558 #: /git/karesansui/karesansui/templates/default/hostby1settingby1proxy/hostby1settingby1proxy.input:115
@@ -6549,7 +6562,7 @@ msgstr ""
65496562 msgid "Use"
65506563 msgstr ""
65516564
6552-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:183
6565+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:207
65536566 #: /git/karesansui/karesansui/templates/default/hostby1settingby1proxy/hostby1settingby1proxy.input:117
65546567 msgid "Not use"
65556568 msgstr ""
--- a/karesansui/gadget/hostby1settingby1general.py
+++ b/karesansui/gadget/hostby1settingby1general.py
@@ -27,7 +27,7 @@ from karesansui.lib.const import LIGHTTPD_COMMAND_UPDATE_CONFIG,\
2727 LIGHTTPD_CONF_TEMP_DIR, LIGHTTPD_PORT_CONFIG,\
2828 LIGHTTPD_ACCESS_CONFIG, LIGHTTPD_SSL_CONFIG,\
2929 LIGHTTPD_DEFAULT_PORT, PORT_MIN_NUMBER, PORT_MAX_NUMBER, \
30- PROXY_ENABLE, PROXY_DISABLE
30+ PROXY_ENABLE, PROXY_DISABLE, LIGHTTPD_DEFAULT_SSL_PORT
3131 from karesansui.lib.utils import get_no_overlap_list, is_param, is_empty, \
3232 uniq_filename
3333 from karesansui.lib.checker import Checker, \
@@ -113,7 +113,14 @@ def validates_server(obj):
113113 checker.add_error(_('"%s" is required.') % _('SSL Settings'))
114114 else:
115115 if obj.input.ssl_status == 'enable':
116- check = True and check
116+ check = checker.check_number(
117+ _('SSL Port Number'),
118+ obj.input.ssl_port,
119+ CHECK_EMPTY | CHECK_VALID | CHECK_MIN | CHECK_MAX,
120+ PORT_MIN_NUMBER,
121+ PORT_MAX_NUMBER,
122+ ) and check
123+
117124 elif obj.input.ssl_status == 'disable':
118125 check = True and check
119126 else:
@@ -136,6 +143,10 @@ def get_view_server_conf(config):
136143 conf_file = config['lighttpd.etc.dir'] + '/' + LIGHTTPD_SSL_CONFIG
137144 ssl_conf = LighttpdSslConf(conf_file)
138145 ssl_status = ssl_conf.read()
146+ if ssl_status["port"]:
147+ ssl_port = ssl_status["port"]
148+ else:
149+ ssl_port = LIGHTTPD_DEFAULT_SSL_PORT
139150
140151 except IOError:
141152 raise KaresansuiGadgetException('Failed to read configuration file. - %s' %\
@@ -144,10 +155,11 @@ def get_view_server_conf(config):
144155 uniqkey = config['application.uniqkey']
145156
146157 server_config = {
147- 'uniqkey' : uniqkey,
148- 'port' : port_number,
158+ 'uniqkey' : uniqkey,
159+ 'port' : port_number,
149160 'access' : access_list,
150161 'ssl_status' : ssl_status["status"],
162+ 'ssl_port' : ssl_port,
151163 }
152164
153165 return server_config
@@ -197,10 +209,10 @@ def set_server_conf(config, input, session):
197209 for key in ('port', 'access', 'ssl'):
198210 if not tmp_file_names.has_key(key):
199211 raise KaresansuiGadgetException(
200- 'Failed to make temporary file for %s' , key)
201- elif os.path.isfile(tmp_file_names[key]) is False:
202- raise KaresansuiGadgetException(
203- 'Not exist temporary file for %s' , key)
212+ 'Failed to make temporary file for %s' , key)
213+ elif os.path.isfile(tmp_file_names[key]) is False:
214+ raise KaresansuiGadgetException(
215+ 'Not exist temporary file for %s' , key)
204216
205217 return tmp_file_names
206218
--- a/karesansui/lib/const.py
+++ b/karesansui/lib/const.py
@@ -185,6 +185,7 @@ LIGHTTPD_COMMAND_UPDATE_CONFIG = "apply_lighttpdconf.py"
185185 LIGHTTPD_CONF_TEMP_DIR = KARESANSUI_TMP_DIR + "/lighttpd"
186186 LIGHTTPD_DEFAULT_PORT = 80
187187 LIGHTTPD_DEFAULT_SSL = "disable"
188+LIGHTTPD_DEFAULT_SSL_PORT = 443
188189 LIGHTTPD_DEFAULT_ACCESS = "all"
189190 LIGHTTPD_PORT_CONFIG = "port.conf"
190191 LIGHTTPD_ACCESS_CONFIG = "access.conf"
--- a/karesansui/lib/file/configfile.py
+++ b/karesansui/lib/file/configfile.py
@@ -97,7 +97,7 @@ class LighttpdSslConf(LighttpdConfig):
9797 tmpl = TemplateLookup(directories = config['application.generate.dir'],
9898 output_encoding='utf-8', input_encoding='utf-8')
9999 template = tmpl.get_template('/ssl_conf.tmpl')
100- f.write(template.render(ssl_status = data.ssl_status))
100+ f.write(template.render(ssl_status = data.ssl_status, ssl_port = data.ssl_port))
101101
102102 class LighttpdAccessConf(LighttpdConfig):
103103
Binary files a/karesansui/locale/en/LC_MESSAGES/messages.mo and b/karesansui/locale/en/LC_MESSAGES/messages.mo differ
--- a/karesansui/locale/en/LC_MESSAGES/messages.po
+++ b/karesansui/locale/en/LC_MESSAGES/messages.po
@@ -9,7 +9,7 @@ msgstr ""
99 "Project-Id-Version: PROJECT VERSION\n"
1010 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
1111 "POT-Creation-Date: 2010-07-22 11:08+0900\n"
12-"PO-Revision-Date: 2010-12-06 16:37+0900\n"
12+"PO-Revision-Date: 2011-01-05 12:34+0900\n"
1313 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414 "Language-Team: en <LL@li.org>\n"
1515 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
@@ -2223,7 +2223,7 @@ msgstr ""
22232223 #: /git/karesansui/karesansui/templates/default/hostby1networkstorageby1/hostby1networkstorageby1.input:141
22242224 #: /git/karesansui/karesansui/templates/default/hostby1networkstorageby1/hostby1networkstorageby1.part:79
22252225 #: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:51
2226-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:129
2226+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:148
22272227 #: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.part:36
22282228 #: /git/karesansui/karesansui/templates/default/hostby1settingby1mail/hostby1settingby1mail.input:22
22292229 #: /git/karesansui/karesansui/templates/default/hostby1settingby1mail/hostby1settingby1mail.input:47
@@ -2246,8 +2246,8 @@ msgstr ""
22462246 #: /git/karesansui/karesansui/templates/default/guest/guest.part:253
22472247 #: /git/karesansui/karesansui/templates/default/host/host.input:122
22482248 #: /git/karesansui/karesansui/templates/default/host/host.input:148
2249-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:125
2250-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:158
2249+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:144
2250+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:180
22512251 #: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.part:29
22522252 #: /git/karesansui/karesansui/templates/default/job/job.html:6
22532253 #: /git/karesansui/karesansui/templates/default/jobby1/jobby1.part:47
@@ -2693,14 +2693,14 @@ msgid "Action Status"
26932693 msgstr ""
26942694
26952695 #: /git/karesansui/karesansui/gadget/hostby1settingby1general.py:75
2696-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:137
2697-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:168
2696+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:156
2697+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:190
26982698 #: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.part:43
26992699 msgid "Access Policy"
27002700 msgstr ""
27012701
27022702 #: /git/karesansui/karesansui/gadget/hostby1settingby1general.py:83
2703-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:173
2703+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:195
27042704 #: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.part:9
27052705 msgid "Permit access from same network"
27062706 msgstr ""
@@ -2713,7 +2713,7 @@ msgstr ""
27132713 #: /git/karesansui/karesansui/gadget/hostby1settingby1general.py:94
27142714 #: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:67
27152715 #: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:78
2716-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:175
2716+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:197
27172717 msgid "Permit access from specified IP address"
27182718 msgstr ""
27192719
@@ -2723,11 +2723,19 @@ msgid "Permit specified IP address"
27232723 msgstr ""
27242724
27252725 #: /git/karesansui/karesansui/gadget/hostby1settingby1general.py:113
2726-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:141
2727-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:180
2726+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:160
2727+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:202
27282728 msgid "SSL Settings"
27292729 msgstr ""
27302730
2731+#: /git/karesansui/karesansui/gadget/hostby1settingby1general.py:117
2732+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:89
2733+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:164
2734+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:211
2735+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.part:65
2736+msgid "SSL Port Number"
2737+msgstr ""
2738+
27312739 #: /git/karesansui/karesansui/gadget/hostby1settingby1mail.py:37
27322740 #: /git/karesansui/karesansui/gadget/hostby1settingby1mail.py:39
27332741 #: /git/karesansui/karesansui/gadget/hostby1settingby1mail.py:43
@@ -4262,7 +4270,7 @@ msgstr ""
42624270 #: /git/karesansui/karesansui/templates/default/hostby1networkstorageby1/hostby1networkstorageby1.input:45
42634271 #: /git/karesansui/karesansui/templates/default/hostby1report/hostby1report.part:32
42644272 #: /git/karesansui/karesansui/templates/default/hostby1reportby1/hostby1reportby1.part:55
4265-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:86
4273+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:96
42664274 #: /git/karesansui/karesansui/templates/default/hostby1settingby1mail/hostby1settingby1mail.input:28
42674275 #: /git/karesansui/karesansui/templates/default/hostby1settingby1ntp/hostby1settingby1ntp.input:28
42684276 #: /git/karesansui/karesansui/templates/default/hostby1settingby1proxy/hostby1settingby1proxy.input:53
@@ -4544,10 +4552,11 @@ msgstr ""
45444552 #: /git/karesansui/karesansui/templates/default/hostby1networkstorage/hostby1networkstorage.input:151
45454553 #: /git/karesansui/karesansui/templates/default/hostby1networkstorageby1/hostby1networkstorageby1.input:163
45464554 #: /git/karesansui/karesansui/templates/default/hostby1networkstorageby1/hostby1networkstorageby1.input:169
4547-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:160
4548-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:165
4549-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:176
4550-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:177
4555+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:182
4556+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:187
4557+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:198
4558+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:199
4559+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:213
45514560 #: /git/karesansui/karesansui/templates/default/hostby1settingby1mail/hostby1settingby1mail.input:68
45524561 #: /git/karesansui/karesansui/templates/default/hostby1settingby1mail/hostby1settingby1mail.input:73
45534562 #: /git/karesansui/karesansui/templates/default/hostby1settingby1ntp/hostby1settingby1ntp.input:55
@@ -5010,7 +5019,7 @@ msgstr ""
50105019 #: /git/karesansui/karesansui/templates/default/hostby1networksettings/hostby1networksettings.part:144
50115020 #: /git/karesansui/karesansui/templates/default/hostby1networkstorage/hostby1networkstorage.part:192
50125021 #: /git/karesansui/karesansui/templates/default/hostby1networkstorageby1/hostby1networkstorageby1.input:187
5013-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:188
5022+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:219
50145023 #: /git/karesansui/karesansui/templates/default/hostby1settingby1mail/hostby1settingby1mail.input:81
50155024 #: /git/karesansui/karesansui/templates/default/hostby1settingby1proxy/hostby1settingby1proxy.input:146
50165025 #: /git/karesansui/karesansui/templates/default/hostby1staticrouteby1/hostby1staticrouteby1.input:115
@@ -5639,7 +5648,7 @@ msgid ""
56395648 msgstr ""
56405649
56415650 #: /git/karesansui/karesansui/templates/default/host/host.input:123
5642-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:126
5651+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:145
56435652 msgid ""
56445653 "A unique ID to distinguish each host when using Karesansui in multi-host "
56455654 "configuration. Should be a unique value between all hosts and guests. "
@@ -6510,11 +6519,11 @@ msgstr ""
65106519 msgid "NTP Settings"
65116520 msgstr ""
65126521
6513-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:134
6522+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:153
65146523 msgid "A listen port number for Karesansui web control panel."
65156524 msgstr ""
65166525
6517-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:138
6526+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:157
65186527 msgid ""
65196528 "Access policy for Karesansui control panel. You may allow access from "
65206529 "specified IP address or network. To \\\"Permit access from same "
@@ -6524,24 +6533,28 @@ msgid ""
65246533 "restart lighttpd via .\\\"Management\\\" - \\\"Service\\\" panel."
65256534 msgstr ""
65266535
6527-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:142
6536+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:161
65286537 msgid "Settings to enable/disable SSL for Karesansui control panel."
65296538 msgstr ""
65306539
6531-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:152
6540+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:165
6541+msgid "A listen port number of SSL for Karesansui control panel."
6542+msgstr ""
6543+
6544+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:174
65326545 msgid "Edit Server Settings"
65336546 msgstr ""
65346547
6535-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:163
6548+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:185
65366549 msgid "Karesansui Port Number"
65376550 msgstr ""
65386551
6539-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:171
6552+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:193
65406553 #: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.part:16
65416554 msgid "Permit access from all"
65426555 msgstr ""
65436556
6544-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:182
6557+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:205
65456558 #: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.part:19
65466559 #: /git/karesansui/karesansui/templates/default/hostby1settingby1proxy/hostby1settingby1proxy.input:7
65476560 #: /git/karesansui/karesansui/templates/default/hostby1settingby1proxy/hostby1settingby1proxy.input:115
@@ -6551,7 +6564,7 @@ msgstr ""
65516564 msgid "Use"
65526565 msgstr ""
65536566
6554-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:183
6567+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:207
65556568 #: /git/karesansui/karesansui/templates/default/hostby1settingby1proxy/hostby1settingby1proxy.input:117
65566569 msgid "Not use"
65576570 msgstr ""
Binary files a/karesansui/locale/ja/LC_MESSAGES/messages.mo and b/karesansui/locale/ja/LC_MESSAGES/messages.mo differ
--- a/karesansui/locale/ja/LC_MESSAGES/messages.po
+++ b/karesansui/locale/ja/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
77 "Project-Id-Version: Karesansui VERSION\n"
88 "Report-Msgid-Bugs-To: EMAIL@karesansui-project.info\n"
99 "POT-Creation-Date: 2010-07-22 14:36+0900\n"
10-"PO-Revision-Date: 2010-12-06 16:37+0900\n"
10+"PO-Revision-Date: 2011-01-05 12:34+0900\n"
1111 "Last-Translator: Kazuhiro Ogura <EMAIL@ADDRESS>\n"
1212 "Language-Team: ja <LL@li.org>\n"
1313 "Plural-Forms: nplurals=1; plural=0\n"
@@ -2221,7 +2221,7 @@ msgstr "%sにコロン(:)が入りすぎています。"
22212221 #: /git/karesansui/karesansui/templates/default/hostby1networkstorageby1/hostby1networkstorageby1.input:141
22222222 #: /git/karesansui/karesansui/templates/default/hostby1networkstorageby1/hostby1networkstorageby1.part:79
22232223 #: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:51
2224-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:129
2224+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:148
22252225 #: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.part:36
22262226 #: /git/karesansui/karesansui/templates/default/hostby1settingby1mail/hostby1settingby1mail.input:22
22272227 #: /git/karesansui/karesansui/templates/default/hostby1settingby1mail/hostby1settingby1mail.input:47
@@ -2244,8 +2244,8 @@ msgstr "ポート番号"
22442244 #: /git/karesansui/karesansui/templates/default/guest/guest.part:253
22452245 #: /git/karesansui/karesansui/templates/default/host/host.input:122
22462246 #: /git/karesansui/karesansui/templates/default/host/host.input:148
2247-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:125
2248-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:158
2247+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:144
2248+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:180
22492249 #: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.part:29
22502250 #: /git/karesansui/karesansui/templates/default/job/job.html:6
22512251 #: /git/karesansui/karesansui/templates/default/jobby1/jobby1.part:47
@@ -2691,14 +2691,14 @@ msgid "Action Status"
26912691 msgstr "アクションステータス"
26922692
26932693 #: /git/karesansui/karesansui/gadget/hostby1settingby1general.py:75
2694-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:137
2695-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:168
2694+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:156
2695+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:190
26962696 #: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.part:43
26972697 msgid "Access Policy"
26982698 msgstr "アクセスポリシー"
26992699
27002700 #: /git/karesansui/karesansui/gadget/hostby1settingby1general.py:83
2701-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:173
2701+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:195
27022702 #: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.part:9
27032703 msgid "Permit access from same network"
27042704 msgstr "同一ネットワークを許可"
@@ -2711,7 +2711,7 @@ msgstr "同一ネットワークを許可"
27112711 #: /git/karesansui/karesansui/gadget/hostby1settingby1general.py:94
27122712 #: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:67
27132713 #: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:78
2714-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:175
2714+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:197
27152715 msgid "Permit access from specified IP address"
27162716 msgstr "特定のIPアドレスを許可"
27172717
@@ -2721,11 +2721,19 @@ msgid "Permit specified IP address"
27212721 msgstr "特定のIPアドレスを許可"
27222722
27232723 #: /git/karesansui/karesansui/gadget/hostby1settingby1general.py:113
2724-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:141
2725-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:180
2724+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:160
2725+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:202
27262726 msgid "SSL Settings"
27272727 msgstr "SSL設定"
27282728
2729+#: /git/karesansui/karesansui/gadget/hostby1settingby1general.py:117
2730+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:89
2731+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:164
2732+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:211
2733+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.part:65
2734+msgid "SSL Port Number"
2735+msgstr "SSLポート番号"
2736+
27292737 #: /git/karesansui/karesansui/gadget/hostby1settingby1mail.py:37
27302738 #: /git/karesansui/karesansui/gadget/hostby1settingby1mail.py:39
27312739 #: /git/karesansui/karesansui/gadget/hostby1settingby1mail.py:43
@@ -4264,7 +4272,7 @@ msgstr "ドメインID"
42644272 #: /git/karesansui/karesansui/templates/default/hostby1networkstorageby1/hostby1networkstorageby1.input:45
42654273 #: /git/karesansui/karesansui/templates/default/hostby1report/hostby1report.part:32
42664274 #: /git/karesansui/karesansui/templates/default/hostby1reportby1/hostby1reportby1.part:55
4267-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:86
4275+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:96
42684276 #: /git/karesansui/karesansui/templates/default/hostby1settingby1mail/hostby1settingby1mail.input:28
42694277 #: /git/karesansui/karesansui/templates/default/hostby1settingby1ntp/hostby1settingby1ntp.input:28
42704278 #: /git/karesansui/karesansui/templates/default/hostby1settingby1proxy/hostby1settingby1proxy.input:53
@@ -4556,10 +4564,11 @@ msgstr "ゲスト作成"
45564564 #: /git/karesansui/karesansui/templates/default/hostby1networkstorage/hostby1networkstorage.input:151
45574565 #: /git/karesansui/karesansui/templates/default/hostby1networkstorageby1/hostby1networkstorageby1.input:163
45584566 #: /git/karesansui/karesansui/templates/default/hostby1networkstorageby1/hostby1networkstorageby1.input:169
4559-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:160
4560-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:165
4561-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:176
4562-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:177
4567+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:182
4568+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:187
4569+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:198
4570+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:199
4571+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:213
45634572 #: /git/karesansui/karesansui/templates/default/hostby1settingby1mail/hostby1settingby1mail.input:68
45644573 #: /git/karesansui/karesansui/templates/default/hostby1settingby1mail/hostby1settingby1mail.input:73
45654574 #: /git/karesansui/karesansui/templates/default/hostby1settingby1ntp/hostby1settingby1ntp.input:55
@@ -5022,7 +5031,7 @@ msgstr "エクスポート"
50225031 #: /git/karesansui/karesansui/templates/default/hostby1networksettings/hostby1networksettings.part:144
50235032 #: /git/karesansui/karesansui/templates/default/hostby1networkstorage/hostby1networkstorage.part:192
50245033 #: /git/karesansui/karesansui/templates/default/hostby1networkstorageby1/hostby1networkstorageby1.input:187
5025-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:188
5034+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:219
50265035 #: /git/karesansui/karesansui/templates/default/hostby1settingby1mail/hostby1settingby1mail.input:81
50275036 #: /git/karesansui/karesansui/templates/default/hostby1settingby1proxy/hostby1settingby1proxy.input:146
50285037 #: /git/karesansui/karesansui/templates/default/hostby1staticrouteby1/hostby1staticrouteby1.input:115
@@ -5653,7 +5662,7 @@ msgid ""
56535662 msgstr "ホストにつけるタグです。一覧表示画面でタグを使った絞り込みを行うことができます（将来のバージョンで実現予定）。全角/半角文字、記号を使うことができます。複数のタグを登録するときはカンマ(,)で区切ってください。"
56545663
56555664 #: /git/karesansui/karesansui/templates/default/host/host.input:123
5656-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:126
5665+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:145
56575666 msgid ""
56585667 "A unique ID to distinguish each host when using Karesansui in multi-host "
56595668 "configuration. Should be a unique value between all hosts and guests. "
@@ -6526,11 +6535,11 @@ msgstr "メール設定"
65266535 msgid "NTP Settings"
65276536 msgstr "NTP設定"
65286537
6529-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:134
6538+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:153
65306539 msgid "A listen port number for Karesansui web control panel."
65316540 msgstr "Karesansuiの管理画面(HTTP)の待受ポート番号です。"
65326541
6533-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:138
6542+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:157
65346543 msgid ""
65356544 "Access policy for Karesansui control panel. You may allow access from "
65366545 "specified IP address or network. To \\\"Permit access from same "
@@ -6540,24 +6549,28 @@ msgid ""
65406549 "restart lighttpd via .\\\"Management\\\" - \\\"Service\\\" panel."
65416550 msgstr "Karesansui管理画面へのアクセスを制御するためのアクセスポリシーです。特定のネットワークやIPアドレスからのみのアクセス許可などが行えます。同一ネットワークを許可」では1つのネットワークをCIDR表記(例:192.168.0.0/24)で指定してください。特定のIPアドレスを許可」で複数のIPアドレスをしたい場合、それぞれのIPアドレスを改行区切りで指定してください。設定完了後は「管理」-「サービス」からlighttpdの再起動を行ってください。"
65426551
6543-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:142
6552+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:161
65446553 msgid "Settings to enable/disable SSL for Karesansui control panel."
65456554 msgstr "Karesansuiの管理画面へのSSL接続を有効にするか否かを設定します。"
65466555
6547-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:152
6556+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:165
6557+msgid "A listen port number of SSL for Karesansui control panel."
6558+msgstr "Karesansuiの管理画面(HTTPS)の待受ポート番号です。"
6559+
6560+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:174
65486561 msgid "Edit Server Settings"
65496562 msgstr "サーバー設定"
65506563
6551-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:163
6564+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:185
65526565 msgid "Karesansui Port Number"
65536566 msgstr "ポート番号"
65546567
6555-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:171
6568+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:193
65566569 #: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.part:16
65576570 msgid "Permit access from all"
65586571 msgstr "全て許可"
65596572
6560-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:182
6573+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:205
65616574 #: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.part:19
65626575 #: /git/karesansui/karesansui/templates/default/hostby1settingby1proxy/hostby1settingby1proxy.input:7
65636576 #: /git/karesansui/karesansui/templates/default/hostby1settingby1proxy/hostby1settingby1proxy.input:115
@@ -6567,7 +6580,7 @@ msgstr "全て許可"
65676580 msgid "Use"
65686581 msgstr "使用"
65696582
6570-#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:183
6583+#: /git/karesansui/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input:207
65716584 #: /git/karesansui/karesansui/templates/default/hostby1settingby1proxy/hostby1settingby1proxy.input:117
65726585 msgid "Not use"
65736586 msgstr "未使用"
--- a/karesansui/templates/default/_generate/ssl_conf.tmpl
+++ b/karesansui/templates/default/_generate/ssl_conf.tmpl
@@ -1,5 +1,5 @@
11 % if ssl_status == "enable":
2-$SERVER["socket"] == ":443" {
2+$SERVER["socket"] == ":${ssl_port}" {
33 ssl.engine = "enable"
44 ssl.pemfile = "/etc/opt/hde/lighttpd/ssl/server.pem"
55 server.document-root = "/opt/hde/www"
--- a/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input
+++ b/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.input
@@ -82,6 +82,16 @@ function validates_server(){
8282 }
8383 }
8484
85+ if($(":input[name='ssl_status']:checked").val() == 'enable'){
86+ check = check_number(
87+ $("#ssl_port"),
88+ CHECK_EMPTY | CHECK_VALID | CHECK_MIN | CHECK_MAX,
89+ "${_('SSL Port Number')}",
90+ PORT_MIN_NUMBER,
91+ PORT_MAX_NUMBER
92+ ) && check;
93+ }
94+
8595 if(!check){
8696 show_alert_msg("${_('Please input correct value.')}\n" + ERROR_MSG);
8797 }
@@ -109,9 +119,18 @@ function showswitch_proxy_setting(proxy_status){
109119 }
110120 }
111121
122+function showswitch_ssl_setting(ssl_status){
123+ if(ssl_status == "enable"){
124+ $("#ssl_port_setting").show();
125+ }else if(ssl_status == "disable"){
126+ $("#ssl_port_setting").hide();
127+ }
128+}
129+
112130 $(document).ready(function(){
113131 showswitch_access_policy($(":input[name='access']:checked").val());
114132 showswitch_proxy_setting($(":input[name='proxy_status']:checked").val());
133+ showswitch_ssl_setting($(":input[name='ssl_status']:checked").val());
115134
116135 ajax_put_event(
117136 "#server_setting_button",
@@ -141,6 +160,9 @@ $(document).ready(function(){
141160 "${_('SSL Settings')}",
142161 "${_("Settings to enable/disable SSL for Karesansui control panel.")}");
143162
163+ helptip("#ssl_port_help",
164+ "${_('SSL Port Number')}",
165+ "${_("A listen port number of SSL for Karesansui control panel.")}");
144166 });
145167
146168 // -->
@@ -179,8 +201,17 @@ $(document).ready(function(){
179201
180202 <div class="grayout-param">${_('SSL Settings')}<span id="ssl_setting_help"/></div>
181203 <div class="grayout-value grayout-form">
182- <input type="radio" name="ssl_status" value="enable" id="ssl_enable" ${ssl_enable_checked} />&nbsp;${_('Use')}&nbsp;&nbsp;
183- <input type="radio" name="ssl_status" value="disable" id="ssl_disable" ${ssl_disable_checked} />&nbsp;${_('Not use')}&nbsp;&nbsp;
204+ <input type="radio" name="ssl_status" value="enable" id="ssl_enable" ${ssl_enable_checked}
205+ onClick="showswitch_ssl_setting('enable')" />&nbsp;${_('Use')}&nbsp;&nbsp;
206+ <input type="radio" name="ssl_status" value="disable" id="ssl_disable" ${ssl_disable_checked}
207+ onClick="showswitch_ssl_setting('disable')" />&nbsp;${_('Not use')}&nbsp;&nbsp;
208+ </div>
209+
210+ <div id="ssl_port_setting">
211+ <div class="grayout-param">${_('SSL Port Number')}<span id="ssl_port_help"/></div>
212+ <div class="grayout-value grayout-form">
213+ <input type="text" name="ssl_port" value="${config['ssl_port']}" id="ssl_port" size="7" maxlength="5" /><span class="require-text">${_('Require')}</span>
214+ </div>
184215 </div>
185216
186217 <div class="grayout-footer">
--- a/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.part
+++ b/karesansui/templates/default/hostby1settingby1general/hostby1settingby1general.part
@@ -60,6 +60,15 @@ else:
6060 </td>
6161 <td>${ssl_status_msg}</td>
6262 </tr>
63+% if config['ssl_status'] == 'enable':
64+ <tr>
65+ <th>${_('SSL Port Number')}</th>
66+ <td>
67+ <img src="${ctx.homepath}/static/images/table-space.gif" alt="" />
68+ </td>
69+ <td>${config['ssl_port'] |h}</td>
70+ </tr>
71+% endif
6372 </table>
6473 <br style="clear: both;"/>
6574 </div>
Show on old repository browser