cherokee at cherokee-project
Jan 29, 2010, 2:34 PM
Post #1 of 1
(94 views)
Permalink
|
|
[4205] cherokee/branches/adminctk/admin/PageGeneral.py: WIP
|
|
Revision: 4205
http://svn.cherokee-project.com/changeset/4205
Author: alo
Date: 2010-01-29 23:34:51 +0100 (Fri, 29 Jan 2010)
Log Message:
-----------
WIP
Modified Paths:
--------------
cherokee/branches/adminctk/admin/PageGeneral.py
Modified: cherokee/branches/adminctk/admin/PageGeneral.py
===================================================================
--- cherokee/branches/adminctk/admin/PageGeneral.py 2010-01-29 22:22:41 UTC (rev 4204)
+++ cherokee/branches/adminctk/admin/PageGeneral.py 2010-01-29 22:34:51 UTC (rev 4205)
@@ -30,10 +30,15 @@
URL_BASE = '/general'
URL_APPLY = '/general/apply'
-NOTE_IPV6 = N_('Set to enable the IPv6 support. The OS must support IPv6 for this to work.')
-NOTE_TOKENS = N_('This option allows to choose how the server identifies itself.')
-NOTE_TIMEOUT = N_('Time interval until the server closes inactive connections.')
-NOTE_TLS = N_('Which, if any, should be the TLS/SSL backend.')
+NOTE_IPV6 = N_('Set to enable the IPv6 support. The OS must support IPv6 for this to work.')
+NOTE_TOKENS = N_('This option allows to choose how the server identifies itself.')
+NOTE_TIMEOUT = N_('Time interval until the server closes inactive connections.')
+NOTE_TLS = N_('Which, if any, should be the TLS/SSL backend.')
+NOTE_COLLECTORS = N_('How the usage graphics should be generated.')
+NOTE_POST_TRACKS = N_('How to track uploads/posts so its progress can be reported to the user.')
+NOTE_USER = N_('Changes the effective user. User names and IDs are accepted.')
+NOTE_GROUP = N_('Changes the effective group. Group names and IDs are accepted.')
+NOTE_CHROOT = N_('Jail the server inside the directory. Don\'t use it as the only security measure.')
HELPS = [('config_general', N_("General Configuration")),
('config_quickstart', N_("Configuration Quickstart"))]
@@ -42,35 +47,57 @@
def apply():
return {'ret': 'ok'}
-class PortsWidget (CTK.Container):
- def __init__ (self):
- CTK.Container.__init__ (self)
- self += CTK.RawHTML ('Ports Content')
class NetworkWidget (CTK.Container):
def __init__ (self):
CTK.Container.__init__ (self)
- self += CTK.RawHTML ("<h2>%s</h2>" %(_('Support')))
table = CTK.PropsTableAuto (URL_APPLY)
table.Add (_('IPv6'), CTK.CheckCfg('server!ipv6', True), _(NOTE_IPV6))
table.Add (_('SSL/TLS back-end'), CTK.ComboCfg('server!tls', Cherokee.modules_available(CRYPTORS)), _(NOTE_TLS))
+ self += CTK.RawHTML ("<h2>%s</h2>" %(_('Support')))
self += table
- self += CTK.RawHTML ("<h2>%s</h2>" %(_('Network behavior')))
table = CTK.PropsTableAuto (URL_APPLY)
table.Add (_('Timeout (<i>secs</i>)'), CTK.TextCfg('server!timeout'), _(NOTE_TIMEOUT))
table.Add (_('Server Tokens'), CTK.ComboCfg('server!server_tokens', PRODUCT_TOKENS), _(NOTE_TOKENS))
+ self += CTK.RawHTML ("<h2>%s</h2>" %(_('Network behavior')))
self += table
+ table = CTK.PropsTableAuto (URL_APPLY)
+ table.Add (_('Graphs Type'), CTK.ComboCfg('server!collector', Cherokee.modules_available(COLLECTORS)), _(NOTE_COLLECTORS))
+ self += CTK.RawHTML ("<h2>%s</h2>" %(_('Information Collector')))
+ self += table
+ table = CTK.PropsTableAuto (URL_APPLY)
+ table.Add (_('Upload Tracking'), CTK.ComboCfg('server!post_track', Cherokee.modules_available(POST_TRACKERS)), _(NOTE_POST_TRACKS))
+ self += CTK.RawHTML ("<h2>%s</h2>" %(_('Upload Tracking')))
+ self += table
+
+class PortsWidget (CTK.Container):
+ def __init__ (self):
+ CTK.Container.__init__ (self)
+ self += CTK.RawHTML ('Ports Content')
+
+class PermsWidget (CTK.Container):
+ def __init__ (self):
+ CTK.Container.__init__ (self)
+
+ table = CTK.PropsTableAuto (URL_APPLY)
+ self += CTK.RawHTML ("<h2>%s</h2>" %(_('Execution Permissions')))
+ table.Add (_('User'), CTK.TextCfg('server!user'), _(NOTE_USER))
+ table.Add (_('Group'), CTK.TextCfg('server!group'), _(NOTE_GROUP))
+ table.Add (_('Chroot'), CTK.TextCfg('server!chroot'), _(NOTE_CHROOT))
+ self += table
+
class Render():
def __call__ (self):
txt = "<h1>%s</h1>" %(_('General Settings'))
tabs = CTK.Tab()
- tabs.Add (_('Network'), NetworkWidget())
- tabs.Add (_('Ports to listen'), PortsWidget())
+ tabs.Add (_('Network'), NetworkWidget())
+ tabs.Add (_('Ports to listen'), PortsWidget())
+ tabs.Add (_('Server Permissions'), PermsWidget())
page = Page.Base (HELPS)
page += CTK.RawHTML(txt)
|
