<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[165411] trunk/Websites/perf.webkit.org</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/165411">165411</a></dd>
<dt>Author</dt> <dd>zoltan@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-10 16:01:18 -0700 (Mon, 10 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update the install guidelines for perf.webkit.org
https://bugs.webkit.org/show_bug.cgi?id=129895
Reviewed by Ryosuke Niwa.
The current install guideline for perf.webkit.org discourages the use of the installed
Server application. I've actualized the documentation for Mavericks, and modified the
guideline to include the instructions for Server.app also.
* Install.md:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebsitesperfwebkitorgChangeLog">trunk/Websites/perf.webkit.org/ChangeLog</a></li>
<li><a href="#trunkWebsitesperfwebkitorgInstallmd">trunk/Websites/perf.webkit.org/Install.md</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebsitesperfwebkitorgChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/ChangeLog (165410 => 165411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/ChangeLog 2014-03-10 22:49:04 UTC (rev 165410)
+++ trunk/Websites/perf.webkit.org/ChangeLog 2014-03-10 23:01:18 UTC (rev 165411)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-03-10 Zoltan Horvath <zoltan@webkit.org>
+
+ Update the install guidelines for perf.webkit.org
+ https://bugs.webkit.org/show_bug.cgi?id=129895
+
+ Reviewed by Ryosuke Niwa.
+
+ The current install guideline for perf.webkit.org discourages the use of the installed
+ Server application. I've actualized the documentation for Mavericks, and modified the
+ guideline to include the instructions for Server.app also.
+
+ * Install.md:
+
</ins><span class="cx"> 2014-03-08 Zoltan Horvath <zoltan@webkit.org>
</span><span class="cx">
</span><span class="cx"> Update perf.webkit.org json example
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgInstallmd"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/Install.md (165410 => 165411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/Install.md 2014-03-10 22:49:04 UTC (rev 165410)
+++ trunk/Websites/perf.webkit.org/Install.md 2014-03-10 23:01:18 UTC (rev 165411)
</span><span class="lines">@@ -1,9 +1,11 @@
</span><span class="cx"> # Checking Out the Code and Installing Required Applications
</span><span class="cx">
</span><del>-Note: These instructions assume you're using Mac OS X Mountain Lion as the host server, and assume that we're installing
-this application at `/Volumes/Data/WebKitPerfMonitor`.
</del><ins>+The instructions assume you're using Mac OS X (Mavericks for Server.app case and Mountain Lion without Server.app) as the
+host server, and assume that we're installing this application at `/Volumes/Data/WebKitPerfMonitor`.
</ins><span class="cx">
</span><del>-1. Install Server (DO NOT launch the Server app)
</del><ins>+You can choose between using Server.app or install the required tools separately
+
+1. Install Server.app (if you don't want to use Server.app, install PostgreSQL: http://www.postgresql.org/download/macosx/)
</ins><span class="cx"> 2. Install node.
</span><span class="cx"> 3. Install Xcode with command line tools (only needed for svn)
</span><span class="cx"> 4. `svn co https://svn.webkit.org/repository/webkit/trunk/Websites/perf.webkit.org /Volumes/Data/WebKitPerfMonitor`
</span><span class="lines">@@ -12,34 +14,49 @@
</span><span class="cx">
</span><span class="cx"> # Configuring Apache
</span><span class="cx">
</span><del>-Don't use the Server App to start or stop Apache. It does weird things to httpd configurations. Use apachectl instead:
- - Starting httpd: `sudo apachectl stop`
- - Stopping httpd: `sudo apachectl restart`
</del><ins>+You can use apachectl to start/stop/restart apache server from the command line:
</ins><span class="cx">
</span><del>-## Edit /private/etc/apache2/httpd.conf
</del><ins>+ - Starting httpd: `sudo apachectl start`
+ - Stopping httpd: `sudo apachectl stop`
+ - Restarting httpd: `sudo apachectl restart`
</ins><span class="cx">
</span><del>-1. Update ServerAdmin to your email address
-2. Change DocumentRoot to `/Volumes/Data/WebKitPerfMonitor/public/`
-3. Uncomment `"LoadModule php5_module libexec/apache2/libphp5.so"`
-4. Modify the directives for the document root and / to allow overriding `"All"`
-5. Delete directives on CGI-Executables
-6. Add the following directives to enable gzip:
-
</del><ins>+## Instructions if you're using Server.app
+
+ - Enable PHP web applications
+ - Go to Server Website / Store Site Files In, change it to /Volumes/Data/WebKitPerfMonitor/public/`
+ - Go to Server Website / Edit advanced settings, enable Allow overrides using .htaccess files
+
+## Instructions if you're not using Server.app
+
+ - Edit /private/etc/apache2/httpd.conf
+
+ 1. Change DocumentRoot to `/Volumes/Data/WebKitPerfMonitor/public/`
+ 2. Uncomment `"LoadModule php5_module libexec/apache2/libphp5.so"`
+ 3. Modify the directives for the document root and / to allow overriding `"All"`
+ 4. Delete directives on CGI-Executables
+
+## Common directives for the related apache config file
+
+ httpd config file is located at:
+
+ - With Server.app: /Library/Server/Web/Config/apache2/sites/0000_any_80.conf (and/or 0000_any_`PORT#`.conf)
+ - Without: /private/etc/apache2/httpd.conf
+
+ 1. Update ServerAdmin to your email address
+ 2. Add the following directives to enable gzip:
+
</ins><span class="cx"> <IfModule mod_deflate.c>
</span><span class="cx"> AddOutputFilterByType DEFLATE text/html text/xml text/plain application/json application/xml application/xhtml+xml
</span><span class="cx"> </IfModule>
</span><span class="cx">
</span><del>-7. Add the following directives to enable zlib compression and MultiViews on WebKitPerfMonitor/public:
</del><ins>+ 3. Add the following directives to enable zlib compression and MultiViews on WebKitPerfMonitor/public:
</ins><span class="cx">
</span><span class="cx"> Options Indexes MultiViews
</span><span class="cx"> php_flag zlib.output_compression on
</span><span class="cx">
</span><del>-Note: If you've accidentally turned on the Server app, httpd.conf is located at `/Library/Server/Web/Config/apache2/` instead.
-Delete the Web Sharing related stuff and include `/private/etc/apache2/httpd.conf` at the very end.
</del><ins>+The apache logs are located at `/private/var/log/apache2`.
</ins><span class="cx">
</span><del>-The log is located at `/private/var/log/apache2`.
</del><span class="cx">
</span><del>-
</del><span class="cx"> # Protecting the Administrative Pages to Prevent Execution of Arbitrary Code
</span><span class="cx">
</span><span class="cx"> By default, the application gives the administrative privilege to everyone. Anyone can add, remove, or edit tests,
</span><span class="lines">@@ -55,7 +72,7 @@
</span><span class="cx"> AuthUserFile "<Realm>"
</span><span class="cx"> Require valid-user
</span><span class="cx">
</span><del>-where <Realm> is replaced with the realm of your choice.
</del><ins>+where <Realm> is replaced with the realm of your choice, which will be displayed on the username/password input box.
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> # Configuring PostgreSQL
</span><span class="lines">@@ -67,6 +84,8 @@
</span><span class="cx">
</span><span class="cx"> ## Creating a Database and a User
</span><span class="cx">
</span><ins>+The binaries located in PostgreSQL's directory, or if you're using Server.app in /Applications/Server.app/Contents/ServerRoot/usr/bin/
+
</ins><span class="cx"> 1. Create a database: `createdb webkit-perf-db -h localhost`
</span><span class="cx"> 2. Create a user: `createuser -P -S -e webkit-perf-db-user -h localhost`
</span><span class="cx"> 3. Connect to database: `psql webkit-perf-db -h localhost`
</span></span></pre>
</div>
</div>
</body>
</html>