Changeset 1752
- Timestamp:
- 08/06/08 18:39:41 (5 months ago)
- Files:
-
- cherokee/trunk/ChangeLog (modified) (1 diff)
- cherokee/trunk/admin/ModuleRedir.py (modified) (1 diff)
- cherokee/trunk/admin/PageEntry.py (modified) (2 diffs)
- cherokee/trunk/doc/Makefile.am (modified) (1 diff)
- cherokee/trunk/doc/TOC.txt (modified) (2 diffs)
- cherokee/trunk/doc/TODO (modified) (2 diffs)
- cherokee/trunk/doc/basics_requirements.txt (modified) (3 diffs)
- cherokee/trunk/doc/bundle_cget.txt (added)
- cherokee/trunk/doc/config_quickstart.txt (moved) (moved from cherokee/trunk/doc/config_walkthrough.txt) (1 diff)
- cherokee/trunk/doc/config_virtual_servers_rule.txt (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
cherokee/trunk/ChangeLog
r1751 r1752 1 2008-08-06 Taher Shihadeh <taher@unixwars.com> 2 3 1 4 2008-08-06 Alvaro Lopez Ortega <alvaro@alobbs.com> 2 5 cherokee/trunk/admin/ModuleRedir.py
r1749 r1752 16 16 Module.__init__ (self, 'redir', cfg, prefix, submit_url) 17 17 FormHelper.__init__ (self, 'redir', cfg) 18 18 19 19 def _op_render (self): 20 20 cfg_key = "%s!rewrite" % (self._prefix) cherokee/trunk/admin/PageEntry.py
r1744 r1752 114 114 pre = self._conf_prefix 115 115 tabs = [] 116 116 117 117 # Rule Properties 118 tabs += [('Rule', self._render_rule())] 118 tabs += [('Rule', self._render_rule())] 119 119 120 120 # Handler 121 121 table = TableProps() 122 e = self.AddPropOptions_Reload (table, 'Handler', '%s!handler'%(pre), 122 e = self.AddPropOptions_Reload (table, 'Handler', '%s!handler'%(pre), 123 123 modules_available(HANDLERS), NOTE_HANDLER) 124 124 self.AddPropEntry (table, 'Document Root', '%s!document_root'%(pre), NOTE_DOCUMENT_ROOT) … … 134 134 txt = '<h1>%s</h1>' % (self._get_title (html=True)) 135 135 txt += self.InstanceTab (tabs) 136 form = Form (self.submit_url, a dd_submit=False)136 form = Form (self.submit_url, auto=False) 137 137 return form.Render(txt) 138 138 cherokee/trunk/doc/Makefile.am
r1744 r1752 28 28 bundle_cherokee-tweak.html \ 29 29 bundle_spawn-fcgi.html \ 30 config_walkthrough.html \ 30 bundle_cget.html \ 31 config_quickstart.html \ 31 32 config_general.html \ 32 33 config_virtual_servers.html \ cherokee/trunk/doc/TOC.txt
r1744 r1752 5 5 . link:basics_requirements.html[Requirements] 6 6 . link:basics_download.html[Download] 7 . link:basics_installation_unix.html[Installation] 8 - link:basics_installation_unix.html[Unix] 9 - link:basics_installation_windows.html[Windows] 7 . link:basics_installation_unix.html[Installation: Unix] 8 . link:basics_installation_windows.html[Installation: Windows] 10 9 . link:basics_upgrade.html[Upgrading Cherokee] 11 10 . link:basics_running_cherokee.html[Running Cherokee] … … 19 18 . link:bundle_cherokee-guardian.html[cherokee-guardian] 20 19 . link:bundle_cherokee-tweak.html[cherokee-tweak] 21 . link:bundle_ spawn-fcgi.html[spawn-fcgi]20 . link:bundle_cget.html[cget] 22 21 23 22 ************************** 24 23 Configuration 25 24 ************************** 26 Walkthrough <1> link:config_walkthrough.html[]25 . Quickstart <1> link:config_quickstart.html[] 27 26 . link:config_general.html[General] 28 27 . link:config_virtual_servers.html[Virtual servers] cherokee/trunk/doc/TODO
r1724 r1752 4 4 Needs: 5 5 ---------- 6 *[1] Improve the navigability of the documentation.7 *[2] Define a convenient hierarchical structure, generate a TOC, etc.6 [1] Improve the navigability of the documentation. 7 [2] Define a convenient hierarchical structure, generate a TOC, etc. 8 8 Currently the structure reflects more the internal architecture of 9 9 Cherokee rather than a traditional manual. … … 25 25 documentations scope. A Development section could be introduced when we 26 26 design the new general draft. 27 * <8> Table with equivalent functionality (and hopefully a full setup example)28 to that of specific mod_* Apache modules.27 * <8> Reference table of functionalities to be achieved (and hopefully 28 a full setup example). 29 29 * <9> Cherokee on exotic devices 30 31 Actual Structure:32 ------------------------33 Currently there is a way to generate a combined documentation with a TOC,34 but navigability is less than optimal. A combined.html file can be created35 using Asciidoc with the doc/build/build_combined.sh script, but internal36 navigability is less than optimal. There might be a way to fix this other37 than combining the whole documentation into a unique TXT file for Asciidoc38 to process. The mentioned script creates the following Table of Contents:39 40 1. Download41 2. Cherokee Documentation42 2.1. Compiling and Installing43 2.2. Configuration Interface44 2.3. General configuration45 2.4. Virtual Servers46 2.5. Encoders47 2.6. Icons48 2.7. Advanced topics49 2.8. Other advanced topics50 2.9. Internal configuration system51 3. Compiling and installing on Unix52 3.1. Required53 3.2. Optional54 3.3. Quickstart55 3.4. Advanced parameters56 3.5. Autostart57 4. Cherokee Admin58 5. General Configuration59 5.1. Binding60 5.2. IPv6 support61 5.3. Timeout62 5.4. KeepAlive63 5.5. Server Tokens64 5.6. Execution User and Group65 6. Virtual Server66 6.1. Add a new Virtual Server67 6.2. Basics68 6.3. Domain names69 6.4. Behavior70 6.5. Error Handler71 6.6. Logging72 6.7. Security73 7. Authentication74 7.1. Htpasswd Validator75 7.1.1. Parameters76 7.1.2. Compatibility77 7.1.3. Example78 7.2. Htdigest Validator79 7.2.1. Parameters80 7.2.2. Compatibility81 7.2.3. Example82 7.3. Mysql Validator83 7.3.1. Parameters84 7.3.2. Compatibility85 7.3.3. Example86 7.4. Pam Validator87 7.4.1. Parameters88 7.4.2. Compatibility89 7.4.3. Example90 7.5. Plain Validator91 7.5.1. Syntax92 7.5.2. Parameters93 7.5.3. Compatibility94 7.5.4. Example95 8. Virtual Server Rule96 8.1. OnlySecure97 8.2. Allow From98 8.3. Examples99 8.4. Authentication100 9. Icons101 10. Advanced Configuration102 11. Debugging Cherokee103 12. How to cross compile Cherokee104 12.1. Cherokee-Win32 from Linux105 12.2. Cherokee-Win32 from OS X106 13. How to generate SSL keys107 13.1. Locate CA.pl or CA.sh108 13.2. Create a new CA109 13.3. Generate a certificate request110 13.4. Sign the certificate request111 13.5. Self signed certificates112 14. Cherokee Tweak113 15. Internal Configuration114 15.1. Introduction115 15.2. Server116 15.3. Server Encoders117 15.4. Virtual Server118 15.5. Defining a virtual server behavior119 15.6. Logs120 15.7. Inclusion of Configuration121 16. Loggers122 16.1. Combined123 16.2. NCSA124 16.3. W3C125 17. Handler: CGI126 17.1. Parameters127 17.2. Examples128 18. Handler: List & Send129 18.1. Parameters130 18.2. Examples131 19. Handler: Directory Listing132 19.1. Parameters133 19.2. Examples134 20. Handler: FastCGI135 20.1. Parameters136 20.2. Examples137 20.3. Configuring PHP138 20.4. Note for developers139 21. Handler: File sending140 21.1. Parameters141 21.2. Examples142 22. Handler: Redirections143 22.1. Parameters144 22.2. Examples145 23. Handler: SCGI146 24. Balancer: Round Robin147 25. Enconder: Gzip148 149 Future structure:150 ------------------------151 To be determined. Navigability strategy must be drafted.152 Each module could have a screenshot.153 The proposed structure reuses the points of the previous documents shown154 between brackets, and between '<>' the documentation tasks proposed above.155 156 Refer to TOC.txt to see it.cherokee/trunk/doc/basics_requirements.txt
r1718 r1752 15 15 16 16 Software 17 ~~~~~~~~ 17 ~~~~~~~~ 18 18 Cherokee has no dependencies besides a standard libc. Everything else 19 19 is optional. Obviously anything beyond mere static content serving 20 20 must be available for Cherokee to correctly execute the task. This 21 21 means you will need PHP if you want Cherokee to serve PHP dynamic 22 content, MySQL or LDAP if you set up theses as authentication 23 mechanisms for protected content and so on. 22 content, MySQL or LDAP development libraries if you want built-in 23 support for these as authentication mechanisms for protected content 24 and so on. 25 24 26 25 27 If you intend to build Cherokee from source however, you will need … … 33 35 34 36 * Python: Cherokee has an administrative web interface written in 35 Python, so if you intend to use cherokee-admin you will need this. 37 Python, so if you intend to use cherokee-admin you will need this. 36 38 For disk space constrained environments this won't be an issue 37 39 since you would probably want to make a minimal install in your … … 50 52 * If you want to make a build that serves secure content, you will 51 53 need TLS libraries. Cherokee supports two different SSL/TLS 52 libraries: OpenSSL and GNUTLS. You need to have one of those53 libraries with its development files.54 54 libraries: OpenSSL and GNUTLS. You need to have the development 55 files of one of these in order to build a package that suits your 56 needs. cherokee/trunk/doc/config_quickstart.txt
r1744 r1752 2 2 ------------------------ 3 3 4 This section briefly describes the whole administration web interface 5 provided by link:bundle_cherokee-admin.html[cherokee-admin]. This is 6 the only recommended way of configuring Cherokee. If you are looking 7 for development information, you should refer to the apropriate 8 section, especially link:dev_cherokee.conf.html[cherokee.conf] file 9 specification. 4 10 5 General configuration 6 ~~~~~~~~~~~~~~~~~~~~~ 11 We will first show a quick overview of the available options, followed 12 by a simple walkthrough. You can learn more about the options in their 13 specific documentation entries. 7 14 8 There are a number a link:general.html[general configuration] entries that specify the 9 most significant configuration options such as the port - or ports - 10 that the server will listen to, the default timeout, whether to 11 support keep-alive connections and so on. 15 Overview 16 ~~~~~~~~ 17 * link:config_general.html[General]:: 18 There are a number of entries that specify the most significant 19 configuration options such as the port - or ports - that the server 20 will listen to, the default timeout, whether to support keep-alive 21 connections and so on. 12 22 13 Virtual Servers 14 ~~~~~~~~~~~~~~~ 23 * link:config_virtual_servers.html[Virtual servers]:: 24 If you want your web server to work with more than one domain you 25 will have to create link:config_virtual_servers.html[Virtual 26 servers] other than the `default` one. Each one will have a 27 completely independent configuration: paths, behavior, logging 28 facilities, etc. 15 29 16 If you want your web server to work with more than one link:vserver.html[virtual server] 17 you will have just to create them. Each more will have a 18 complete independent configuration: paths, behavior, logging 19 facilities, etc.30 * link:config_encoding.html[Encoding]:: 31 The encoders allow to transform whatever information the server is 32 sending as a response of a request, no matter what handler is 33 generating it. 20 34 21 Encoders 22 ~~~~~~~~ 35 * link:config_icons.html[Icons]:: 36 Associate icon images with one or more file extensions. Used to 37 offer directory listings. 23 38 24 The encoders allow to transform whatever information the server 25 is sending as a response of a request, no matter what handler 26 is generating it. 39 * link:config_mime_types.html[Mime Types]:: 40 Manage MIME types. 27 41 28 - link:modules_encoders_gzip.html[gzip] - GZip compression 29 30 Encodes the output with GZip 42 * link:config_advanced.html[Advanced]:: 43 This is to configure the most complex parameters of the server and how 44 it interacts with the operating system. If you are unsure about any of 45 the options here, better not mingle with them. Default values should 46 work just fine. 31 47 32 Icons 33 ~~~~~ 34 35 The link:config_icons.html[Icons] configuration associates an icon 36 image with one or more file extensions. This information will be used 37 mainly by the link:modules_handlers_dirlist.html[dirlist] handler. 38 39 40 Advanced topics 41 ~~~~~~~~~~~~~~~ 42 43 There is an link:advanced.html[advanced section] that allows to 44 configure the most complex parameters of the server and how it works 45 with the operating system. 46 47 If you are unsure about any of the options presented within the 48 advanced section, we recommend you to not change it and use the 49 default value. 50 51 52 Other advanced topics 53 ~~~~~~~~~~~~~~~~~~~~~ 54 55 - link:debug.html[Debugging] Cherokee 56 - How to link:cross_compile_cherokee.html[cross compile Cherokee] (Win32 from Linux or OS X) 57 - How to link:generating_ssl_keys.html[generate SSL keys] 58 - link:cherokee_tweak.html[Cherokee Tweak]: command-line interface for administrative tasks. 59 60 Internal configuration system 61 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 62 63 The administration interface is highly recommended, and is in fact the 64 only administration mechanism that should be used to configure 65 Cherokee. However, there is another way in which Cherokee developers 66 and very advance users can modify the configuration. 67 68 The link:internal_configuration.html[internal configuration system] text file format is documented so 48 Walkthrough 49 ~~~~~~~~~~~ cherokee/trunk/doc/config_virtual_servers_rule.txt
r1744 r1752 76 76 validaton mechanism. The following `validators` are available: 77 77 78 - link:modules_validators_htdigest.html[htdigest] - **Htdigest** 78 - link:modules_validators_plain.html[plain] - **Plain text file** 79 80 Uses a plain flat file to perform HTTP authentication. 81 82 - link:modules_validators_htpasswd.html[htpasswd] - **Htpasswd file** 83 84 Uses an htpasswd file to perform HTTP authentication. 85 86 - link:modules_validators_htdigest.html[htdigest] - **Htdigest file** 79 87 80 88 Uses an htdigest-generated file to perform HTTP authentication. 81 89 82 - link:modules_validators_htpasswd.html[htpasswd] - **Htpasswd** 83 84 Uses an htpasswd file to perform HTTP authentication. 85 86 - link:modules_validators_ldap.html[ldap] - **LDAP Authentication** 90 - link:modules_validators_ldap.html[ldap] - **LDAP server** 87 91 88 92 Uses an LDAP directory to perform HTTP authentication. 89 93 90 - link:modules_validators_mysql.html[mysql] - **MySQL Authentication**94 - link:modules_validators_mysql.html[mysql] - **MySQL server** 91 95 92 96 Uses a MySQL database to perform HTTP authentication. … … 95 99 96 100 Uses PAM to perform HTTP authentication. 97 98 - link:modules_validators_plain.html[plain] - **Plain Flat File Authentication**99 100 Uses a plain flat file to perform HTTP authentication.101 101 102 102