Unreviewed typo fix. The prefix in triggerable_configurations is "trigconfig", not...

[WebKit-https.git] / Websites / perf.webkit.org / Install.md

diff --git a/Websites/perf.webkit.org/Install.md b/Websites/perf.webkit.org/Install.md
index 37ba7c3805a855c6062edc2a43feb0b5c6d1cf78..58e5be778f7c5ae0555d2788db8d7d49e556dae8 100644 (file)
--- a/Websites/perf.webkit.org/Install.md
+++ b/Websites/perf.webkit.org/Install.md
@@ -1,43 +1,63 @@
 # Checking Out the Code and Installing Required Applications
 
 # Checking Out the Code and Installing Required Applications
 

-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`.
+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/perf.webkit.org`.

 
 

-1. Install Server (DO NOT launch the Server app)
+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/)

 2. Install node.
 3. Install Xcode with command line tools (only needed for svn)
 2. Install node.
 3. Install Xcode with command line tools (only needed for svn)

-4. `svn co https://svn.webkit.org/repository/webkit/trunk/Websites/perf.webkit.org /Volumes/Data/WebKitPerfMonitor`
-5. Inside `/Volumes/Data/WebKitPerfMonitor`, run `npm install pg`.
+4. `svn co https://svn.webkit.org/repository/webkit/trunk/Websites/perf.webkit.org /Volumes/Data/perf.webkit.org`
+5. Inside `/Volumes/Data/perf.webkit.org`, run `npm install pg`.

 
 
 # Configuring Apache
 
 
 
 # Configuring Apache
 

-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`
+You can use apachectl to start/stop/restart apache server from the command line:
+
+ - Starting httpd: `sudo apachectl start`
+ - Stopping httpd: `sudo apachectl stop`
+ - Restarting httpd: `sudo apachectl restart`
+
+## Instructions if you're using Server.app
+
+ - Enable PHP web applications
+ - Go to Server Website / Store Site Files In, change it to /Volumes/Data/perf.webkit.org/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/perf.webkit.org/public/`
+     2. Uncomment `"LoadModule php5_module libexec/apache2/libphp5.so"`
+     3. Disable directives for CGI-Executables
+
+ - In Mavericks and later, copy php.ini to load pdo_pgsql.so pgsql.so.
+    `sudo cp /Applications/Server.app/Contents/ServerRoot/etc/php.ini /etc/`

 
 

-## Edit /private/etc/apache2/httpd.conf

 
 

-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:
-    
+## 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:
+

         <IfModule mod_deflate.c>
             AddOutputFilterByType DEFLATE text/html text/xml text/plain application/json application/xml application/xhtml+xml
         </IfModule>
 
         <IfModule mod_deflate.c>
             AddOutputFilterByType DEFLATE text/html text/xml text/plain application/json application/xml application/xhtml+xml
         </IfModule>
 

-7. Add the following directives to enable zlib compression and MultiViews on WebKitPerfMonitor/public:
+ 3. Add the following directives to enable zlib compression and MultiViews on DocumentRoot (perf.webkit.org/public):

 
         Options Indexes MultiViews
         php_flag zlib.output_compression on
 
 
         Options Indexes MultiViews
         php_flag zlib.output_compression on
 

-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.
-
-The log is located at `/private/var/log/apache2`.
+The apache logs are located at `/private/var/log/apache2`.

 
 
 # Protecting the Administrative Pages to Prevent Execution of Arbitrary Code
 
 
 # Protecting the Administrative Pages to Prevent Execution of Arbitrary Code


@@ -55,18 +75,20 @@ Generate a password file via `htdigest -c <path> <realm> <username>`, and then c
        AuthUserFile "<Realm>"
        Require valid-user
 
        AuthUserFile "<Realm>"
        Require valid-user
 

-where <Realm> is replaced with the realm of your choice.
+where <Realm> is replaced with the realm of your choice, which will be displayed on the username/password input box.

 
 
 # Configuring PostgreSQL
 
 
 
 # Configuring PostgreSQL
 

-1. Create database: `/Applications/Server.app/Contents/ServerRoot/usr/bin/initdb /Volumes/Data/WebKitPerfMonitor/PostgresSQL`
+1. Create database: `/Applications/Server.app/Contents/ServerRoot/usr/bin/initdb /Volumes/Data/perf.webkit.org/PostgresSQL`

 2. Start database:
 2. Start database:

-   `/Applications/Server.app/Contents/ServerRoot/usr/bin/pg_ctl -D /Volumes/Data/WebKitPerfMonitor/PostgresSQL
-   -l logfile -o "-k /Volumes/Data/WebKitPerfMonitor/PostgresSQL" start`
+   `/Applications/Server.app/Contents/ServerRoot/usr/bin/pg_ctl -D /Volumes/Data/perf.webkit.org/PostgresSQL
+   -l logfile -o "-k /Volumes/Data/perf.webkit.org/PostgresSQL" start`

 
 ## Creating a Database and a User
 
 
 ## Creating a Database and a User
 

+The binaries located in PostgreSQL's directory, or if you're using Server.app in /Applications/Server.app/Contents/ServerRoot/usr/bin/
+

 1. Create a database: `createdb webkit-perf-db -h localhost`
 2. Create a user: `createuser -P -S -e webkit-perf-db-user -h localhost`
 3. Connect to database: `psql webkit-perf-db -h localhost`
 1. Create a database: `createdb webkit-perf-db -h localhost`
 2. Create a user: `createuser -P -S -e webkit-perf-db-user -h localhost`
 3. Connect to database: `psql webkit-perf-db -h localhost`


@@ -76,4 +98,8 @@ where <Realm> is replaced with the realm of your choice.
 ## Initializing the Database
 
 Run `database/init-database.sql` in psql as `webkit-perf-db-user`:
 ## Initializing the Database
 
 Run `database/init-database.sql` in psql as `webkit-perf-db-user`:

-`psql webkit-perf-db -h localhost --username webkit-perf-db-user -f database/init-database.sql`
+`psql webkit-perf-db -h localhost --username webkit-perf-db-user -f init-database.sql`
+
+## Making a Backup of the Database
+
+Run `/Applications/Server.app/Contents/ServerRoot/usr/bin/pg_dump -h localhost --no-owner -f <filepath> safari-perf-db`