PmWiki Info

Main.PmWikiInfo History

Hide minor edits - Show changes to output

Deleted lines 5-93:
!! General Idea
The site has three Apache instances that are used for different roles on the machine:

# Apache SEAL1 (port 80) - public access applications.
# Apache ZENDCORE (port 89) - development applications for research away from public view except by valid user profile access only.
# PASE Apache (port 8000) - provides proxy PHP services for SEAL1 and ZENDCORE.


!! Apache Configurations
!!! Apache Port 80 (SEAL1)
This Apache instance is the existing System i web site named SEAL1 and is the default http port 80. The proxy additions allow for selected php applications to be enabled on the site with no disruption to current content.
[@
Additions to /www/seal1/conf/httpd.conf:
LoadModule proxy_module /QSYS.LIB/QHTTPSVR.LIB/QZSRCORE.SRVPGM
LoadModule proxy_http_module /QSYS.LIB/QHTTPSVR.LIB/QZSRCORE.SRVPGM
LoadModule proxy_connect_module /QSYS.LIB/QHTTPSVR.LIB/QZSRCORE.SRVPGM
LoadModule proxy_ftp_module /QSYS.LIB/QHTTPSVR.LIB/QZSRCORE.SRVPGM
ProxyPreserveHost On

ProxyPass /wiki http://127.0.0.1:8000/wiki
ProxyPassReverse /wiki http://127.0.0.1:8000/wiki
@]
Content from port 80 is accessed from document root /www/seal1/htdocs, with the exception of proxy /wiki which is actually served from the PASE Apache. From a security point of view this proxy setting means that only PASE Apache PHP files in /www/zendcore/htdocs/wiki are available to the public view, which gives tremendous control over what PHP applications are exposed on the site. To add PHP applications simply specify the directories with the ProxyPass and ProxyPassReverse directives.
[@
Example additions of new PHP application to /www/seal1/conf/httpd.conf:
ProxyPass /wiki http://127.0.0.1:8000/wiki
ProxyPassReverse /wiki http://127.0.0.1:8000/wiki

ProxyPass /phpapp2 http://127.0.0.1:8000/phpapp2
ProxyPassReverse /phpapp2 http://127.0.0.1:8000/phpapp2


ProxyPass /phpapp3 http://127.0.0.1:8000/phpapp3
ProxyPassReverse /phpapp3 http://127.0.0.1:8000/phpapp3

@]
!!! Apache Port 89 (ZENDCORE)
This Apache instance was created by Zend Core for i5/OS installation named ZENDCORE and is the PHP development port 89. This configuration has been modified to only allow valid machine profiles to use this address.
[@
Additions to /www/zendcore/conf/httpd.conf
ProxyPreserveHost On

<Location />
    AuthType Basic
    AuthName "YiPs PHP Development"
    Require valid-user
    PasswdFile %%SYSTEM%%
    ProfileToken On
    Allow from all
</Location>
@]
Full PHP content including Zend Core GUI administration panels is public available from port 89, therefore basic authorization forcing a valid user profile on the machine is required. The port 89 instance is considered the development and administration port for PHP activities. The document home for this Apache is the same as the PASE Apache at /www/zendcore/htdocs.

!!! Apache Port 8000 (PASE Apache)
This Apache instance was created by Zend Core for i5/OS installation, it only responds to *LOCALHOST requests, specifically proxy requests from SEAL1 and ZENDCORE Apache instances. This instance is commonly referred to as PASE Apache and this configuration enables fast branch and link Apache module PHP script processing not available with the traditional ILE Apache. This configuration has been modified to enable .htaccess files for "Clean URLs" in the wiki application.
[@
Changes to /usr/local/Zend/apache2/conf/httpd.conf
#
# AllowOverride controls what directives may be placed in .htaccess files.
# It can be "All", "None", or any combination of the keywords:
#  Options FileInfo AuthConfig Limit
#
    AllowOverride None

changed to:

    AllowOverride All
@]
In selected social circles PASE Apache is considered a security risk (no offence meant AIX folks), however in this configuration only *LOCALHOST http requests are available to the public behind the ILE Apache(s) proxy, which generally leaves only your trusted programmers to do you evil (EOM).
!!! .htaccess override
Apache .htaccess file was added to the wiki directory to allow for "Clean URLs" in the wiki application served by the PASE Apache. This allows for much nicer bookmarks for your browser.
[@
Added .htaccess file to /www/zendcore/htdocs/wiki
# Use mod_rewrite to enable "Clean URLs" for a PmWiki installation.
RewriteEngine On
# Define the rewrite base.  It's not necessarily PmWiki's directory.
RewriteBase /wiki
# Send requests without parameters to pmwiki.php.
RewriteRule ^$          pmwiki.php  [L]
# Send requests for index.php to pmwiki.php.
RewriteRule ^index\.php$ pmwiki.php  [L]
# Send requests to pmwiki.php, appending the query string part.
RewriteRule ^([A-Z0-9\xa0-\xff].*)$ pmwiki.php?n=$1  [QSA,L]
@]

!! Security from phpBB (comming soon)
When the site has the phpBB application available a full authentication scheme hosted through phpBB will be added (see [[http://www.pmwiki.org/wiki/Cookbook/AuthPhpbb2Sso | Single Sign On for PmWiki and phpBB2]]). Until then the YiPs forum link on the side bar will provide you with the single site password after you register.

Added lines 122-125:


!!! Author(s)
Tony "Ranger" Cairns - IBM i PHP / PASE
Deleted lines 5-8:
!! Security from phpBB (comming soon)
When the site has the phpBB application available a full authentication scheme hosted through phpBB will be added (see [[http://www.pmwiki.org/wiki/Cookbook/AuthPhpbb2Sso | Single Sign On for PmWiki and phpBB2]]). Until then the YiPs forum link on the side bar will provide you with the single site password after you register.

Deleted lines 88-92:

Change .htaccess file in /www/zendcore/htdocs/development/wiki
# Define the rewrite base.  It's not necessarily PmWiki's directory.
RewriteBase /development/wiki

Added lines 91-94:
!! Security from phpBB (comming soon)
When the site has the phpBB application available a full authentication scheme hosted through phpBB will be added (see [[http://www.pmwiki.org/wiki/Cookbook/AuthPhpbb2Sso | Single Sign On for PmWiki and phpBB2]]). Until then the YiPs forum link on the side bar will provide you with the single site password after you register.

Changed line 100 from:
!! Cookbook additions
to:
!! Cookbook additions to this wiki
Deleted lines 126-130:


!! Wiki edit test drive
* Area for editing this wiki [[Temp/WikiSandbox]].

Changed line 6 from:
!! Security from phpBB
to:
!! Security from phpBB (comming soon)
Changed lines 110-112 from:
to:
* [[http://www.pmwiki.org/wiki/Cookbook/ProtectEmail| Email obfuscation]]

Added lines 6-9:
!! Security from phpBB
When the site has the phpBB application available a full authentication scheme hosted through phpBB will be added (see [[http://www.pmwiki.org/wiki/Cookbook/AuthPhpbb2Sso | Single Sign On for PmWiki and phpBB2]]). Until then the YiPs forum link on the side bar will provide you with the single site password after you register.

Changed lines 105-106 from:
to:
* [[http://www.pmwiki.org/wiki/PmWiki/RSS | RSS feeds]]
Changed lines 7-14 from:
The general idea behind this site multiple Apache instance configuration is to limit risk to the system to only the trusted programmers with valid user profiles on the system. The site has three Apache instances that are used for different roles on the machine:

#
Apache SEAL1 (port 80) - public readonly view of the PHP wiki, locked by IFS access to NOBODY *RX only in /www/zendcore/htdocs/wiki.
# Apache ZENDCORE (port 89) - development *RWX view of the PHP wiki and other PHP tools, locked away from public view except by valid user profile access only.
# PASE Apache (port 8000) - provides proxy PHP services for SEAL1 and ZENDCORE, locked away from public view by *LOCALHOST access only.

Apache content IFS files will be locked down with ACL settings based on the desired access. For instance, in the case of this wiki, the editable version of the wiki will be in document root /www/zendcore/htdocs/development/wiki only accessable from port 89, while the public readonly version of the wiki will be in /www/zendcore/htdocs/wiki. Simple System i access grants on the two directories will assure security of the site. For PHP application PmWiki this also means uploads will not be allowed in the public view of the wiki.

to:
The site has three Apache instances that are used for different roles on the machine:

# Apache SEAL1 (port 80) - public access applications.
# Apache ZENDCORE (port 89) - development applications for research away from public view except by valid user profile access only.
# PASE
Apache (port 8000) - provides proxy PHP services for SEAL1 and ZENDCORE.

Changed line 16 from:
This Apache instance is the existing System i web site named SEAL1 and is the default http port 80. The proxy additions allow for selected php applications to be enabled on the site with no disruption to current content. The copy of the wiki seen from this port can not be edited, only the port 89 wiki copy can be modified and then copied to this public view.
to:
This Apache instance is the existing System i web site named SEAL1 and is the default http port 80. The proxy additions allow for selected php applications to be enabled on the site with no disruption to current content.
Changed line 43 from:
This Apache instance was created by Zend Core for i5/OS installation named ZENDCORE and is the PHP development port 89. This configuration has been modified to only allow valid machine profiles to use this address. An editable copy of the wiki can be accessed from this port.
to:
This Apache instance was created by Zend Core for i5/OS installation named ZENDCORE and is the PHP development port 89. This configuration has been modified to only allow valid machine profiles to use this address.
Added line 58:
Changed lines 10-12 from:
# Apache ZENDCORE (port 89) - development *RWX view of the PHP wiki and other PHP tools, locked by valid user profile access only.
# PASE Apache (port 8000) - provides PHP services to SEAL1 and ZENDCORe, locked bey
*LOCALHOST access only.
to:
# Apache ZENDCORE (port 89) - development *RWX view of the PHP wiki and other PHP tools, locked away from public view except by valid user profile access only.
# PASE Apache (port 8000) - provides proxy PHP services for SEAL1 and ZENDCORE, locked away from public view by
*LOCALHOST access only.
Changed lines 7-8 from:
The general idea behind this site multiple Apache instance configuration is to limited risk to the system to only the trusted programmers with valid user profiles on the system. The traditional default browser http serving port (80), will provide readonly content of PHP wiki data to the public. The Zend Core for i5/OS browser port 89 will allow trusted users with a valid profile to access and create PHP and/or wiki content. Port 80 and 89 will get PHP services from the PASE Apache running on internal port 8000, however the public port 80 will only be able to access selected PHP applications.
to:
The general idea behind this site multiple Apache instance configuration is to limit risk to the system to only the trusted programmers with valid user profiles on the system. The site has three Apache instances that are used for different roles on the machine:

# Apache SEAL1 (port 80) - public readonly view of the PHP wiki, locked by IFS access to NOBODY *RX only in
/www/zendcore/htdocs/wiki.
# Apache ZENDCORE (port 89) - development *RWX view of the PHP wiki and other PHP tools, locked by valid user profile access only.
# PASE Apache (port 8000) - provides
PHP services to SEAL1 and ZENDCORe, locked bey *LOCALHOST access only.
Changed lines 35-36 from:
ProxyPass /phpagain http://127.0.0.1:8000/phpagain
ProxyPassReverse /phpagain http://127.0.0.1:8000/phpagain
to:
ProxyPass /phpapp2 http://127.0.0.1:8000/phpapp2
ProxyPassReverse /phpapp2 http://127.0.0.1:8000/phpapp2


ProxyPass /phpapp3 http://127.0.0.1:8000/phpapp3
ProxyPassReverse /phpapp3 http://127.0.0.1:8000/phpapp3

Changed line 51 from:
   AuthName "lp0364d.rchland.ibm.com"
to:
   AuthName "YiPs PHP Development"
Changed lines 90-92 from:
* [[http://www.pmwiki.org/wiki/Cookbook/WikiStylesPlus | styles plus]] may need edit GUI buttons
*
[[http://www.pmwiki.org/wiki/Cookbook/MarkupExtensions | more markups]] may need edit GUI buttons
*
[[http://www.pmwiki.org/wiki/Cookbook/Voting | crude voting]] will need to upgrade to raster
to:
* [[http://www.pmwiki.org/wiki/Cookbook/WikiStylesPlus | styles plus]]
* [[http://www.pmwiki.org/wiki/Cookbook/MarkupExtensions | more markups]]
* [[http://www.pmwiki.org/wiki/Cookbook/Voting | crude voting]]
Changed line 94 from:
* [[http://www.pmwiki.org/wiki/Cookbook/Tabtable-raf | excel tables]] not tried
to:
* [[http://www.pmwiki.org/wiki/Cookbook/Tabtable-raf | excel tables]]
Deleted lines 115-119:
!! To do list
Things still waiting for administration work.
* [[http://www.pmwiki.org/wiki/PmWiki/UploadsAdmin | Upload]] files needs a strategy (upload RPG?, SAVF, ???)
* [[http://www.pmwiki.org/wiki/PmWiki/Security | Security]] finer granularity in security, more wiki author passwords, etc.

Added lines 80-84:

Change .htaccess file in /www/zendcore/htdocs/development/wiki
# Define the rewrite base.  It's not necessarily PmWiki's directory.
RewriteBase /development/wiki

Changed lines 7-8 from:
The general idea behind this site multiple Apache instance configuration is to limited risk to the system to only the trusted programmers with valid user profiles on the system. The traditional default browser http serving port (80), will provide readonly content of PHP wiki data to the public. The Zend Core for i5/OS browser port 89 will allow trusted users with a valid profile to access and create PHP content. Port 80 and 89 will get PHP services from the PASE Apache running on internal port 8000, however the public port 80 will only be able to access selected PHP applications.
to:
The general idea behind this site multiple Apache instance configuration is to limited risk to the system to only the trusted programmers with valid user profiles on the system. The traditional default browser http serving port (80), will provide readonly content of PHP wiki data to the public. The Zend Core for i5/OS browser port 89 will allow trusted users with a valid profile to access and create PHP and/or wiki content. Port 80 and 89 will get PHP services from the PASE Apache running on internal port 8000, however the public port 80 will only be able to access selected PHP applications.
Added lines 6-10:
!! General Idea
The general idea behind this site multiple Apache instance configuration is to limited risk to the system to only the trusted programmers with valid user profiles on the system. The traditional default browser http serving port (80), will provide readonly content of PHP wiki data to the public. The Zend Core for i5/OS browser port 89 will allow trusted users with a valid profile to access and create PHP content. Port 80 and 89 will get PHP services from the PASE Apache running on internal port 8000, however the public port 80 will only be able to access selected PHP applications.

Apache content IFS files will be locked down with ACL settings based on the desired access. For instance, in the case of this wiki, the editable version of the wiki will be in document root /www/zendcore/htdocs/development/wiki only accessable from port 89, while the public readonly version of the wiki will be in /www/zendcore/htdocs/wiki. Simple System i access grants on the two directories will assure security of the site. For PHP application PmWiki this also means uploads will not be allowed in the public view of the wiki.

Changed lines 20-21 from:
!!! Apache Port 89 (ZENDCORE)
This Apache instance was created by Zend Core for i5
/OS installation named ZENDCORE and is the PHP development port 89. This configuration has been modified to only allow valid machine profiles to use this address. An editable copy of the wiki can be accessed from this port.
to:
Content from port 80 is accessed from document root /www/seal1/htdocs, with the exception of proxy /wiki which is actually served from the PASE Apache. From a security point of view this proxy setting means that only PASE Apache PHP files in /www/zendcore/htdocs/wiki are available to the public view, which gives tremendous control over what PHP applications are exposed on the site. To add PHP applications simply specify the directories with the ProxyPass and ProxyPassReverse directives.
Added lines 22-31:
Example additions of new PHP application to /www/seal1/conf/httpd.conf:
ProxyPass /wiki http://127.0.0.1:8000/wiki
ProxyPassReverse /wiki http://127.0.0.1:8000/wiki

ProxyPass /phpagain http://127.0.0.1:8000/phpagain
ProxyPassReverse /phpagain http://127.0.0.1:8000/phpagain
@]
!!! Apache Port 89 (ZENDCORE)
This Apache instance was created by Zend Core for i5/OS installation named ZENDCORE and is the PHP development port 89. This configuration has been modified to only allow valid machine profiles to use this address. An editable copy of the wiki can be accessed from this port.
[@
Added line 44:
Full PHP content including Zend Core GUI administration panels is public available from port 89, therefore basic authorization forcing a valid user profile on the machine is required. The port 89 instance is considered the development and administration port for PHP activities. The document home for this Apache is the same as the PASE Apache at /www/zendcore/htdocs.
Added line 60:
In selected social circles PASE Apache is considered a security risk (no offence meant AIX folks), however in this configuration only *LOCALHOST http requests are available to the public behind the ILE Apache(s) proxy, which generally leaves only your trusted programmers to do you evil (EOM).
Changed line 8 from:
This Apache instance is the existing System i web site named SEAL1 and is the default http port 80. The proxy additions allow for selected php applications to be enabled on the site with no disruption to current content. This copy of the wiki can not be edited, only the port 89 wiki copy can be modified and then copied to this public view.
to:
This Apache instance is the existing System i web site named SEAL1 and is the default http port 80. The proxy additions allow for selected php applications to be enabled on the site with no disruption to current content. The copy of the wiki seen from this port can not be edited, only the port 89 wiki copy can be modified and then copied to this public view.
Changed line 8 from:
This Apache instance is the existing System i web site named SEAL1 and is the default http port 80. The proxy additions allow for selected php applications to be enabled on the site with no disruption to current content.
to:
This Apache instance is the existing System i web site named SEAL1 and is the default http port 80. The proxy additions allow for selected php applications to be enabled on the site with no disruption to current content. This copy of the wiki can not be edited, only the port 89 wiki copy can be modified and then copied to this public view.
Changed line 21 from:
This Apache instance was created by Zend Core for i5/OS installation named ZENDCORE and is the PHP development port 89. This configuration has been modified to only allow valid machine profiles to use this address.
to:
This Apache instance was created by Zend Core for i5/OS installation named ZENDCORE and is the PHP development port 89. This configuration has been modified to only allow valid machine profiles to use this address. An editable copy of the wiki can be accessed from this port.
Changed line 6 from:
!! Apache changes for this site
to:
!! Apache Configurations
Changed lines 50-51 from:
* PASE Apache .htaccess file was added to the wiki directory to allow for "Clean URLs" in the wiki application. This allows for much nicer bookmarks for your browser.
to:
!!! .htaccess override
Apache .htaccess file was added to the wiki directory to allow for "Clean URLs" in the wiki application served by the PASE Apache. This allows for much nicer bookmarks for your browser.
Changed line 7 from:
!!! Apache Port 80 (instance SEAL1)
to:
!!! Apache Port 80 (SEAL1)
Changed line 20 from:
!!! Apache Port 89 (instance ZENDCORE)
to:
!!! Apache Port 89 (ZENDCORE)
Changed line 35 from:
!!! Apache Port 8000 (instance PASE Apache)
to:
!!! Apache Port 8000 (PASE Apache)
Changed lines 7-8 from:
This site uses three Apache configurations:
*
This Apache instance is the existing System i web site named SEAL1 and is the default http port 80. The proxy additions allow for selected php applications to be enabled on the site with no disruption to current content.
to:
!!! Apache Port 80 (instance SEAL1)
This Apache instance is the existing System i web site named SEAL1 and is the default http port 80. The proxy additions allow for selected php applications to be enabled on the site with no disruption to current content.
Changed lines 20-21 from:
* This Apache instance was created by Zend Core for i5/OS installation named ZENDCORE and is the PHP development port 89. This configuration has been modified to only allow valid machine profiles to use this address.
to:
!!! Apache Port 89 (instance ZENDCORE)
This Apache instance was created by Zend Core for i5/OS installation named ZENDCORE and is the PHP development port 89. This configuration has been modified to only allow valid machine profiles to use this address.
Changed lines 35-36 from:
* This Apache instance was created by Zend Core for i5/OS installation, it only responds to *LOCALHOST requests, specifically proxy requests from SEAL1 and ZENDCORE Apache instances. This instance is commonly referred to as PASE Apache and this configuration enables fast branch and link Apache module PHP script processing not available with the traditional ILE Apache. This configuration has been modified to enable .htaccess files for "Clean URLs" in the wiki application.
to:
!!! Apache Port 8000 (instance PASE Apache)
This Apache instance was created by Zend Core for i5/OS installation, it only responds to *LOCALHOST requests, specifically proxy requests from SEAL1 and ZENDCORE Apache instances. This instance is commonly referred to as PASE Apache and this configuration enables fast branch and link Apache module PHP script processing not available with the traditional ILE Apache. This configuration has been modified to enable .htaccess files for "Clean URLs" in the wiki application.
Changed line 8 from:
* SEAL1 is the traditional port 80. This Apache instance is the existing System i web site. The proxy additions allow for selected php applications to be enabled on the site with no disruption to current content.
to:
* This Apache instance is the existing System i web site named SEAL1 and is the default http port 80. The proxy additions allow for selected php applications to be enabled on the site with no disruption to current content.
Changed line 20 from:
* ZENDCORE is the development port 89. This Apache instance was created by Zend Core for i5/OS installation. This configuration has been modified to only allow valid machine profiles to use this address.
to:
* This Apache instance was created by Zend Core for i5/OS installation named ZENDCORE and is the PHP development port 89. This configuration has been modified to only allow valid machine profiles to use this address.
Changed line 34 from:
* PASE Apache is the proxy target on port 8000. This Apache instance was created by Zend Core for i5/OS installation. This configuration has been modified to enable .htaccess files for "Clean URLs" in the wiki application.
to:
* This Apache instance was created by Zend Core for i5/OS installation, it only responds to *LOCALHOST requests, specifically proxy requests from SEAL1 and ZENDCORE Apache instances. This instance is commonly referred to as PASE Apache and this configuration enables fast branch and link Apache module PHP script processing not available with the traditional ILE Apache. This configuration has been modified to enable .htaccess files for "Clean URLs" in the wiki application.
Changed line 48 from:
* PASE Apache .htaccess. This file was added to the wiki directory to allow for "Clean URLs" in the wiki application.
to:
* PASE Apache .htaccess file was added to the wiki directory to allow for "Clean URLs" in the wiki application. This allows for much nicer bookmarks for your browser.
Changed line 8 from:
* SEAL1 is the traditional port 80. This is the existing System i web site. The proxy additions allow for selected php applications to be enabled on the site with no disruption to current content.
to:
* SEAL1 is the traditional port 80. This Apache instance is the existing System i web site. The proxy additions allow for selected php applications to be enabled on the site with no disruption to current content.
Changed line 6 from:
!! Site layout
to:
!! Apache changes for this site
Changed line 8 from:
* SEAL1 is the traditional port 80.
to:
* SEAL1 is the traditional port 80. This is the existing System i web site. The proxy additions allow for selected php applications to be enabled on the site with no disruption to current content.
Changed line 20 from:
* ZENDCORE is the development port 89.
to:
* ZENDCORE is the development port 89. This Apache instance was created by Zend Core for i5/OS installation. This configuration has been modified to only allow valid machine profiles to use this address.
Changed line 34 from:
* PASE Apache is the target of proxies to port 8000.
to:
* PASE Apache is the proxy target on port 8000. This Apache instance was created by Zend Core for i5/OS installation. This configuration has been modified to enable .htaccess files for "Clean URLs" in the wiki application.
Changed line 48 from:
* PASE Apache .htaccess
to:
* PASE Apache .htaccess. This file was added to the wiki directory to allow for "Clean URLs" in the wiki application.
Added lines 9-19:
[@
Additions to /www/seal1/conf/httpd.conf:
LoadModule proxy_module /QSYS.LIB/QHTTPSVR.LIB/QZSRCORE.SRVPGM
LoadModule proxy_http_module /QSYS.LIB/QHTTPSVR.LIB/QZSRCORE.SRVPGM
LoadModule proxy_connect_module /QSYS.LIB/QHTTPSVR.LIB/QZSRCORE.SRVPGM
LoadModule proxy_ftp_module /QSYS.LIB/QHTTPSVR.LIB/QZSRCORE.SRVPGM
ProxyPreserveHost On

ProxyPass /wiki http://127.0.0.1:8000/wiki
ProxyPassReverse /wiki http://127.0.0.1:8000/wiki
@]
Added lines 21-33:
[@
Additions to /www/zendcore/conf/httpd.conf
ProxyPreserveHost On

<Location />
    AuthType Basic
    AuthName "lp0364d.rchland.ibm.com"
    Require valid-user
    PasswdFile %%SYSTEM%%
    ProfileToken On
    Allow from all
</Location>
@]
Changed lines 35-62 from:
to:
[@
Changes to /usr/local/Zend/apache2/conf/httpd.conf
#
# AllowOverride controls what directives may be placed in .htaccess files.
# It can be "All", "None", or any combination of the keywords:
#  Options FileInfo AuthConfig Limit
#
    AllowOverride None

changed to:

    AllowOverride All
@]
* PASE Apache .htaccess
[@
Added .htaccess file to /www/zendcore/htdocs/wiki
# Use mod_rewrite to enable "Clean URLs" for a PmWiki installation.
RewriteEngine On
# Define the rewrite base.  It's not necessarily PmWiki's directory.
RewriteBase /wiki
# Send requests without parameters to pmwiki.php.
RewriteRule ^$          pmwiki.php  [L]
# Send requests for index.php to pmwiki.php.
RewriteRule ^index\.php$ pmwiki.php  [L]
# Send requests to pmwiki.php, appending the query string part.
RewriteRule ^([A-Z0-9\xa0-\xff].*)$ pmwiki.php?n=$1  [QSA,L]
@]

Deleted lines 21-25:
!! Things still waiting for administration work.
* [[http://www.pmwiki.org/wiki/PmWiki/UploadsAdmin | Upload]] files needs a strategy (upload RPG?, SAVF, ???)
* [[http://www.pmwiki.org/wiki/PmWiki/Security | Security]] finer granularity in security, more wiki author passwords, etc.

Added lines 40-45:

!! To do list
Things still waiting for administration work.
* [[http://www.pmwiki.org/wiki/PmWiki/UploadsAdmin | Upload]] files needs a strategy (upload RPG?, SAVF, ???)
* [[http://www.pmwiki.org/wiki/PmWiki/Security | Security]] finer granularity in security, more wiki author passwords, etc.

Changed lines 7-11 from:
to:
This site uses three Apache configurations:
* SEAL1 is the traditional port 80.
* ZENDCORE is the development port 89.
* PASE Apache is the target of proxies to port 8000.

Changed lines 1-2 from:
Here is a test drive area for editing this wiki [[Temp/WikiSandbox]].
to:
(:quicktoc:)
>>round frame bgcolor=#ffffdd<<
!!! Site Information
>><<

!! Site layout

!! Cookbook additions
Changed line 18 from:
Things still waiting for administration work.
to:
!! Things still waiting for administration work.
Changed line 23 from:
Basic wiki tasks (from original sidebar)
to:
!! Basic wiki tasks
Added lines 37-40:


!! Wiki edit test drive
* Area for editing this wiki [[Temp/WikiSandbox]].
Added lines 1-2:
Here is a test drive area for editing this wiki [[Temp/WikiSandbox]].
Changed lines 3-4 from:
* [[http://www.pmwiki.org/wiki/Cookbook/WikiStylesPlus | more editing styles]] may need edit GUI buttons
* [[http://www.pmwiki.org/wiki/Cookbook/MarkupExtensions | more editing styles]] may need edit GUI buttons
to:
* [[http://www.pmwiki.org/wiki/Cookbook/WikiStylesPlus | styles plus]] may need edit GUI buttons
* [[http://www.pmwiki.org/wiki/Cookbook/MarkupExtensions | more markups]] may need edit GUI buttons
Changed lines 3-4 from:
* [[http://www.pmwiki.org/wiki/Cookbook/WikiStylesPlus | more editing styles]] has GUI buttons
* [[http://www.pmwiki.org/wiki/Cookbook/MarkupExtensions | more editing styles]] needs GUI buttons
to:
* [[http://www.pmwiki.org/wiki/Cookbook/WikiStylesPlus | more editing styles]] may need edit GUI buttons
* [[http://www.pmwiki.org/wiki/Cookbook/MarkupExtensions | more editing styles]] may need edit GUI buttons
Changed lines 12-14 from:
* {{http://www.pmwiki.org/wiki/PmWiki/Security | Security]] finer granularity in security, more wiki author passwords, etc.

to:
* [[http://www.pmwiki.org/wiki/PmWiki/Security | Security]] finer granularity in security, more wiki author passwords, etc.

Changed lines 12-13 from:

to:
* {{http://www.pmwiki.org/wiki/PmWiki/Security | Security]] finer granularity in security, more wiki author passwords, etc.

Deleted line 0:
Changed line 14 from:
Basic wiki tasks (for original sidebar)
to:
Basic wiki tasks (from original sidebar)
Changed lines 1-15 from:
[[PmWiki/PmWiki]]
* [[PmWiki/Initial Setup Tasks]] 
* [[PmWiki/Basic Editing]]
* [[PmWiki/Documentation Index]]
* [[PmWiki/FAQ | PmWiki FAQ ]]
* [[PmWiki/PmWikiPhilosophy]]
* [[PmWiki/Release Notes]]
* [[PmWiki/ChangeLog]]

[[http://www.pmwiki.org | pmwiki.org ]]
* [[Cookbook:CookbookBasics | Cookbook (addons) ]]
* [[Cookbook:Skins | Skins (themes) ]]
* [[PITS:PITS | PITS (issue tracking) ]]
* [[PmWiki/Mailing Lists]]

to:
Added lines 14-28:

Basic wiki tasks (for original sidebar)
* [[PmWiki/PmWiki]]
* [[PmWiki/Initial Setup Tasks]] 
* [[PmWiki/Basic Editing]]
* [[PmWiki/Documentation Index]]
* [[PmWiki/FAQ | PmWiki FAQ ]]
* [[PmWiki/PmWikiPhilosophy]]
* [[PmWiki/Release Notes]]
* [[PmWiki/ChangeLog]]
* [[http://www.pmwiki.org | pmwiki.org ]]
* [[Cookbook:CookbookBasics | Cookbook (addons) ]]
* [[Cookbook:Skins | Skins (themes) ]]
* [[PITS:PITS | PITS (issue tracking) ]]
* [[PmWiki/Mailing Lists]]
Changed lines 17-20 from:
* [[http://www.pmwiki.org/wiki/Cookbook/MonobookSkin | wikipedia-like skin]]
* [[http://www.pmwiki.org/wiki/Cookbook/WikiStylesPlus | more editing styles]]
* [[http://www.pmwiki.org/wiki/Cookbook/MarkupExtensions | more editing styles]]
* [[http://www.pmwiki.org/wiki/Cookbook/Voting | crude voting]]
to:
* [[http://www.pmwiki.org/wiki/Cookbook/MonobookSkin | wikipedia-like skin]]
* [[http://www.pmwiki.org/wiki/Cookbook/WikiStylesPlus | more editing styles]] has GUI buttons
*
[[http://www.pmwiki.org/wiki/Cookbook/MarkupExtensions | more editing styles]] needs GUI buttons
*
[[http://www.pmwiki.org/wiki/Cookbook/Voting | crude voting]] will need to upgrade to raster
Changed line 22 from:
* [[http://www.pmwiki.org/wiki/Cookbook/Tabtable-raf | excel tables]]
to:
* [[http://www.pmwiki.org/wiki/Cookbook/Tabtable-raf | excel tables]] not tried
Added lines 25-27:
Things still waiting for administration work.
* [[http://www.pmwiki.org/wiki/PmWiki/UploadsAdmin | Upload]] files needs a strategy (upload RPG?, SAVF, ???)

Added lines 16-24:
Cookbook additions added to the base release of PmWiki can be seen in the local/config.php file. Here is a list of site information on the additions.
* [[http://www.pmwiki.org/wiki/Cookbook/MonobookSkin | wikipedia-like skin]]
* [[http://www.pmwiki.org/wiki/Cookbook/WikiStylesPlus | more editing styles]]
* [[http://www.pmwiki.org/wiki/Cookbook/MarkupExtensions | more editing styles]]
* [[http://www.pmwiki.org/wiki/Cookbook/Voting | crude voting]]
* [[http://www.pmwiki.org/wiki/Cookbook/GuiEdit | gui edit buttons]]
* [[http://www.pmwiki.org/wiki/Cookbook/Tabtable-raf | excel tables]]
* [[http://www.pmwiki.org/wiki/Cookbook/QuickPageTableOfContents | quick toc]]

Added lines 1-15:
[[PmWiki/PmWiki]]
* [[PmWiki/Initial Setup Tasks]] 
* [[PmWiki/Basic Editing]]
* [[PmWiki/Documentation Index]]
* [[PmWiki/FAQ | PmWiki FAQ ]]
* [[PmWiki/PmWikiPhilosophy]]
* [[PmWiki/Release Notes]]
* [[PmWiki/ChangeLog]]

[[http://www.pmwiki.org | pmwiki.org ]]
* [[Cookbook:CookbookBasics | Cookbook (addons) ]]
* [[Cookbook:Skins | Skins (themes) ]]
* [[PITS:PITS | PITS (issue tracking) ]]
* [[PmWiki/Mailing Lists]]