Changes between Version 1 and Version 2 of TracStandalone

Время:

26 нояб. 2022 г., 14:16:01 (2 года назад)

Автор:

trac

Комментарий:

--

TracStandalone

@@ -39 +39 @@
 }}}
 
+There is support for the HTTPS protocol (//Since 1.3.4//). Specify the path to the PEM certificate file and keyfile using the `--certfile` and `--keyfile` options. You can specify just the `--certfile` option if you have a [https://docs.python.org/2/library/ssl.html#combined-key-and-certificate combined key and certificate].
+
 To exit the server on Windows, be sure to use `CTRL-BREAK` -- using `CTRL-C` will leave a Python process running in the background.
 
@@ -44 +46 @@
 
 === Option 1
-To install as a Windows service, get the [http://www.google.com/search?q=srvany.exe SRVANY] utility and run:
+To install as a Windows service, get the [https://www.google.com/search?q=srvany.exe SRVANY] utility and run:
 {{{#!cmd
  C:\path\to\instsrv.exe tracd C:\path\to\srvany.exe
- reg add HKLM\SYSTEM\CurrentControlSet\Services\tracd\Parameters /v Application /d "\"C:\path\to\python.exe\" \"C:\path\to\python\scripts\tracd-script.py\" <your tracd parameters>"
+ reg add HKLM\SYSTEM\CurrentControlSet\Services\tracd\Parameters /v Application /d "\"C:\path\to\python.exe\" \"C:\path\to\python\scripts\tracd.exe\" <your tracd parameters>"
  net start tracd
 }}}
 
-'''DO NOT''' use {{{tracd.exe}}}.  Instead register {{{python.exe}}} directly with {{{tracd-script.py}}} as a parameter.  If you use {{{tracd.exe}}}, it will spawn the python process without SRVANY's knowledge.  This python process will survive a {{{net stop tracd}}}.
+{{{#!div style="border: 1pt dotted; margin: 1em;"
+**Attention:** Do not use `tracd.exe` directly.  Instead register `python.exe` directly with `tracd.exe` as a parameter.  If you use `tracd.exe`, it will spawn the python process without SRVANY's knowledge.  This python process will survive a `net stop tracd`.
+}}}
 
 If you want tracd to start automatically when you boot Windows, do:
@@ -65 +69 @@
 
 Three (string) parameters are provided:
-||!AppDirectory ||C:\Python26\ ||
+||!AppDirectory ||C:\Python27\ ||
 ||Application ||python.exe ||
-||!AppParameters ||scripts\tracd-script.py -p 8080 ... ||
+||!AppParameters ||scripts\tracd.exe -p 8080 ... ||
 
 Note that, if the !AppDirectory is set as above, the paths of the executable ''and'' of the script name and parameter values are relative to the directory.  This makes updating Python a little simpler because the change can be limited, here, to a single point.
@@ -73 +77 @@
 }}}
 
-For Windows 7 User, srvany.exe may not be an option, so you can use [http://www.google.com/search?q=winserv.exe WINSERV] utility and run:
+For Windows 7 User, srvany.exe may not be an option, so you can use [https://www.google.com/search?q=winserv.exe WINSERV] utility and run:
 {{{#!cmd
-"C:\path\to\winserv.exe" install tracd -displayname "tracd" -start auto "C:\path\to\python.exe" c:\path\to\python\scripts\tracd-script.py <your tracd parameters>"
+"C:\path\to\winserv.exe" install tracd -displayname "tracd" -start auto "C:\path\to\python.exe" c:\path\to\python\scripts\tracd.exe <your tracd parameters>"
 net start tracd
 }}}
@@ -81 +85 @@
 === Option 2
 
-Use [http://trac-hacks.org/wiki/WindowsServiceScript WindowsServiceScript], available at [http://trac-hacks.org/ Trac Hacks]. Installs, removes, starts, stops, etc. your Trac service.
+Use [https://trac-hacks.org/wiki/WindowsServiceScript WindowsServiceScript], available at [https://trac-hacks.org/ Trac Hacks]. Installs, removes, starts, stops, etc. your Trac service.
 
 === Option 3
@@ -141 +145 @@
 This section describes how to use `tracd` with Apache .htpasswd files.
 
-  Note: It is necessary (at least with Python 2.6) to install the fcrypt package in order to
-  decode some htpasswd formats.  Trac source code attempt an `import crypt` first, but there
-  is no such package for Python 2.6. Only `SHA-1` passwords (since Trac 1.0) work without this module.
+  Note: On Windows It is necessary to install the [https://pypi.python.org/pypi/passlib passlib]
+  package in order to decode some htpasswd formats. Only `SHA-1` passwords (since Trac 1.0)
+  work without this module.
 
 To create a .htpasswd file use Apache's `htpasswd` command (see [#GeneratingPasswordsWithoutApache below] for a method to create these files without using Apache):
@@ -167 +171 @@
 === Digest authentication: Using a htdigest password file
 
-If you have Apache available, you can use the htdigest command to generate the password file. Type 'htdigest' to get some usage instructions, or read [http://httpd.apache.org/docs/2.0/programs/htdigest.html this page] from the Apache manual to get precise instructions.  You'll be prompted for a password to enter for each user that you create.  For the name of the password file, you can use whatever you like, but if you use something like `users.htdigest` it will remind you what the file contains. As a suggestion, put it in your <projectname>/conf folder along with the [TracIni trac.ini] file.
+If you have Apache available, you can use the htdigest command to generate the password file. Type 'htdigest' to get some usage instructions, or read [https://httpd.apache.org/docs/2.0/programs/htdigest.html this page] from the Apache manual to get precise instructions.  You'll be prompted for a password to enter for each user that you create.  For the name of the password file, you can use whatever you like, but if you use something like `users.htdigest` it will remind you what the file contains. As a suggestion, put it in your <projectname>/conf folder along with the [TracIni trac.ini] file.
 
 Note that you can start tracd without the `--auth` argument, but if you click on the ''Login'' link you will get an error.
@@ -198 +202 @@
 == Reference
 
-Here's the online help, as a reminder (`tracd --help`):
+Here's the online help, as a reminder (`tracd -h` or `tracd --help`):
 {{{
-Usage: tracd [options] [projenv] ...
-
-Options:
+usage: tracd [-h] [--version] [-e PARENTDIR | -s]
+             [-a DIGESTAUTH | --basic-auth BASICAUTH] [-p PORT] [-b HOSTNAME]
+             [--protocol {http,https,scgi,ajp,fcgi}] [--certfile CERTFILE]
+             [--keyfile KEYFILE] [-q] [--base-path BASE_PATH]
+             [--http10 | --http11] [-r | -d] [--pidfile PIDFILE]
+             [--umask MASK] [--group GROUP] [--user USER]
+             [envs [envs ...]]
+
+positional arguments:
+  envs                  path of the project environment(s)
+
+optional arguments:
+  -h, --help            show this help message and exit
   --version             show program's version number and exit
-  -h, --help            show this help message and exit
-  -a DIGESTAUTH, --auth=DIGESTAUTH
+  -e PARENTDIR, --env-parent-dir PARENTDIR
+                        parent directory of the project environments
+  -s, --single-env      only serve a single project without the project list
+  -a DIGESTAUTH, --auth DIGESTAUTH
                         [projectdir],[htdigest_file],[realm]
-  --basic-auth=BASICAUTH
+  --basic-auth BASICAUTH
                         [projectdir],[htpasswd_file],[realm]
-  -p PORT, --port=PORT  the port number to bind to
-  -b HOSTNAME, --hostname=HOSTNAME
+  -p PORT, --port PORT  the port number to bind to
+  -b HOSTNAME, --hostname HOSTNAME
                         the host name or IP address to bind to
-  --protocol=PROTOCOL   http|scgi|ajp|fcgi
-  -q, --unquote         unquote PATH_INFO (may be needed when using ajp)
-  --http10              use HTTP/1.0 protocol version instead of HTTP/1.1
-  --http11              use HTTP/1.1 protocol version (default)
-  -e PARENTDIR, --env-parent-dir=PARENTDIR
-                        parent directory of the project environments
-  --base-path=BASE_PATH
+  --protocol {http,https,scgi,ajp,fcgi}
+                        the server protocol (default: http)
+  --certfile CERTFILE   PEM certificate file for HTTPS
+  --keyfile KEYFILE     PEM key file for HTTPS
+  -q, --unquote         unquote PATH_INFO (may be needed when using the ajp
+                        protocol)
+  --base-path BASE_PATH
                         the initial portion of the request URL's "path"
+  --http10              use HTTP/1.0 protocol instead of HTTP/1.1
+  --http11              use HTTP/1.1 protocol (default)
   -r, --auto-reload     restart automatically when sources are modified
-  -s, --single-env      only serve a single project without the project list
   -d, --daemonize       run in the background as a daemon
-  --pidfile=PIDFILE     when daemonizing, file to which to write pid
-  --umask=MASK          when daemonizing, file mode creation mask to use, in
-                        octal notation (default 022)
-  --group=GROUP         the group to run as
-  --user=USER           the user to run as
+  --pidfile PIDFILE     file to write pid when daemonizing
+  --umask MASK          when daemonizing, file mode creation mask to use, in
+                        octal notation (default: 022)
+  --group GROUP         the group to run as
+  --user USER           the user to run as
 }}}
 
@@ -236 +253 @@
 === Serving static content
 
-If `tracd` is the only web server used for the project, 
-it can also be used to distribute static content 
+If `tracd` is the only web server used for the project,
+it can also be used to distribute static content
 (tarballs, Doxygen documentation, etc.)
 
@@ -244 +261 @@
 
 Example: given a `$TRAC_ENV/htdocs/software-0.1.tar.gz` file,
-the corresponding relative URL would be `/<project_name>/chrome/site/software-0.1.tar.gz`, 
+the corresponding relative URL would be `/<project_name>/chrome/site/software-0.1.tar.gz`,
 which in turn can be written as `htdocs:software-0.1.tar.gz` (TracLinks syntax) or `[/<project_name>/chrome/site/software-0.1.tar.gz]` (relative link syntax).
 
@@ -284 +301 @@
     implements(IAuthenticator)
 
-    obey_remote_user_header = BoolOption('trac', 'obey_remote_user_header', 'false', 
-               """Whether the 'Remote-User:' HTTP header is to be trusted for user logins 
-                (''since ??.??').""") 
+    obey_remote_user_header = BoolOption('trac', 'obey_remote_user_header', 'false',
+               """Whether the 'Remote-User:' HTTP header is to be trusted for user logins
+                (''since ??.??').""")
 
     def authenticate(self, req):
-        if self.obey_remote_user_header and req.get_header('Remote-User'): 
-            return req.get_header('Remote-User') 
+        if self.obey_remote_user_header and req.get_header('Remote-User'):
+            return req.get_header('Remote-User')
         return None