Changeset 2407
- Timestamp:
- 11/17/08 12:04:29 (2 months ago)
- Files:
-
- cherokee/trunk/ChangeLog (modified) (1 diff)
- cherokee/trunk/admin/PageGeneral.py (modified) (3 diffs)
- cherokee/trunk/admin/consts.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
cherokee/trunk/ChangeLog
r2406 r2407 1 1 2008-11-17 Alvaro Lopez Ortega <alvaro@octality.com> 2 3 * admin/PageGeneral.py, admin/consts.py: Adds a new option for 4 setting the TLS backend. 2 5 3 6 * m4/libgnutls.m4, cherokee/virtual_server.c, cherokee/trunk/admin/PageGeneral.py
r2094 r2407 31 31 NOTE_GROUP = 'Changes the effective group. Group names and IDs are accepted.' 32 32 NOTE_CHROOT = 'Jail the server inside the directory. Don\'t use it as the only security measure.' 33 NOTE_TLS = 'Which, if any, should be the TLS/SSL backend.' 33 34 34 35 HELPS = [('config_general', "General Configuration"), … … 53 54 table = TableProps() 54 55 self.AddPropEntry (table, 'Port', 'server!port', NOTE_PORT) 55 self.AddPropEntry (table, 'Port TLS', 'server!port_tls', NOTE_PORT_TLS)56 56 self.AddPropCheck (table, 'IPv6', 'server!ipv6', True, NOTE_IPV6) 57 57 self.AddPropEntry (table, 'Listen', 'server!listen', NOTE_LISTEN) … … 71 71 txt += self.Indent(table) 72 72 73 txt += "<h2>Secure HTTP</h2>" 74 table = TableProps() 75 self.AddPropEntry (table, 'Port TLS', 'server!port_tls', NOTE_PORT_TLS) 76 self.AddPropOptions_Reload (table, 'Back-end', 'server!tls', 77 modules_available(CRYPTORS), NOTE_TLS) 78 txt += self.Indent(table) 79 73 80 form = Form ("/%s" % (self._id), add_submit=False) 74 81 return form.Render(txt,DEFAULT_SUBMIT_VALUE) cherokee/trunk/admin/consts.py
r2378 r2407 122 122 ('time', 'Custom value') 123 123 ] 124 125 CRYPTORS = [ 126 ('', 'No TLS/SSL'), 127 ('libssl', 'OpenSSL / libssl') 128 ]