<!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>[8821] sites/trunk/wordcamp.org: WC Campsite 2017: Code review fixes.</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 { white-space: pre-line; 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/8821">8821</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/8821","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>vedjain</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-05-20 11:52:41 +0000 (Mon, 20 May 2019)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>WC Campsite 2017: Code review fixes. See desc:
1. Removed redundant comments from `wp-config.php`
2. Moved `.data` to inside `.docker/database`
3. Fixed typos and capitalization
4. Added any missing settings from https://github.com/WordPress/meta-environment/blob/master/wordcamp.test/provision/wp-config.php</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgdockerDockerfile">sites/trunk/wordcamp.org/.docker/Dockerfile</a></li>
<li><a href="#sitestrunkwordcamporgdockernginxconf">sites/trunk/wordcamp.org/.docker/nginx.conf</a></li>
<li><a href="#sitestrunkwordcamporgdockerwpconfigphp">sites/trunk/wordcamp.org/.docker/wp-config.php</a></li>
<li><a href="#sitestrunkwordcamporggitignore">sites/trunk/wordcamp.org/.gitignore</a></li>
<li><a href="#sitestrunkwordcamporgdockercomposeyml">sites/trunk/wordcamp.org/docker-compose.yml</a></li>
<li><a href="#sitestrunkwordcamporgreadmemd">sites/trunk/wordcamp.org/readme.md</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgdockerDockerfile"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/.docker/Dockerfile</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/.docker/Dockerfile 2019-05-20 11:52:34 UTC (rev 8820)
+++ sites/trunk/wordcamp.org/.docker/Dockerfile 2019-05-20 11:52:41 UTC (rev 8821)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,7 +16,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> RUN cp ~/wordcamp.crt /etc/ssl/certs/wordcamp.crt
</span><span class="cx" style="display: block; padding: 0 10px"> RUN cp ~/wordcamp.key /etc/ssl/private/wordcamp.key
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-# IAdd script to install plugin and themes
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+# Add script to install plugin and themes
</ins><span class="cx" style="display: block; padding: 0 10px"> ADD install-plugin-theme.sh /usr/src/public_html/install-plugin-theme.sh
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> # Unfortunately themes and plugins cannot be installed as part of docker setup and have to be run manually.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,18 +24,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> # RUN sh install-plugin-theme.sh
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-# Install wkhtmltopdf for camptix invoices. See https://stackoverflow.com/a/38336153/1845153
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+# Install `wkhtmltopdf` for WordCamp Docs, CampTix Invoices, etc. See https://stackoverflow.com/a/38336153/1845153
</ins><span class="cx" style="display: block; padding: 0 10px"> RUN curl -L https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.4/wkhtmltox-0.12.4_linux-generic-amd64.tar.xz > wkhtmltox.tar.xz
</span><span class="cx" style="display: block; padding: 0 10px"> RUN tar xvf wkhtmltox.tar.xz
</span><span class="cx" style="display: block; padding: 0 10px"> RUN mv wkhtmltox/bin/wkhtmlto* /usr/bin/
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-# Install cli
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+# Install WP-CLI
</ins><span class="cx" style="display: block; padding: 0 10px"> RUN curl -O https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar
</span><span class="cx" style="display: block; padding: 0 10px"> RUN chmod +x wp-cli.phar
</span><span class="cx" style="display: block; padding: 0 10px"> RUN mv wp-cli.phar /usr/local/bin/wp
</span><span class="cx" style="display: block; padding: 0 10px"> RUN apt-get install less -y
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-# Install Mail catcher
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+# Install MailCatcher.
</ins><span class="cx" style="display: block; padding: 0 10px"> RUN apt-get install build-essential libsqlite3-dev ruby-dev -y
</span><span class="cx" style="display: block; padding: 0 10px"> RUN gem install mailcatcher --no-ri --no-rdoc
</span><span class="cx" style="display: block; padding: 0 10px"> RUN apt-get install ssmtp -y
</span></span></pre></div>
<a id="sitestrunkwordcamporgdockernginxconf"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/.docker/nginx.conf</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/.docker/nginx.conf 2019-05-20 11:52:34 UTC (rev 8820)
+++ sites/trunk/wordcamp.org/.docker/nginx.conf 2019-05-20 11:52:41 UTC (rev 8821)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,4 +1,4 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-# Upstream to abstract backend connection(s) for php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+# Upstream to abstract backend connection(s) for PHP
</ins><span class="cx" style="display: block; padding: 0 10px"> upstream php {
</span><span class="cx" style="display: block; padding: 0 10px"> server unix:/tmp/php-cgi.socket;
</span><span class="cx" style="display: block; padding: 0 10px"> server 127.0.0.1:9000;
</span></span></pre></div>
<a id="sitestrunkwordcamporgdockerwpconfigphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/.docker/wp-config.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/.docker/wp-config.php 2019-05-20 11:52:34 UTC (rev 8820)
+++ sites/trunk/wordcamp.org/.docker/wp-config.php 2019-05-20 11:52:41 UTC (rev 8821)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,45 +2,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * The base configuration for WordPress
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * The wp-config.php creation script uses this file during the
- * installation. You don't have to use the web site, you can
- * copy this file to "wp-config.php" and fill in the values.
- *
- * This file contains the following configurations:
- *
- * * MySQL settings
- * * Secret keys
- * * Database table prefix
- * * ABSPATH
- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @link https://codex.wordpress.org/Editing_wp-config.php
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @package WordPress
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/** The name of the database for WordPress */
-define('DB_NAME', 'wordcamp_dev');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/** Database configuration */
+define( 'DB_NAME', 'wordcamp_dev' );
+define( 'DB_USER', 'root' );
+define( 'DB_PASSWORD', 'mysql' );
+define( 'DB_HOST', 'wordcamp.db' );
+define( 'DB_CHARSET', 'utf8' );
+define( 'DB_COLLATE', '' );
+define( 'JETPACK_DEV_DEBUG', true );
+define( 'SAVEQUERIES', true );
+define( 'SCRIPT_DEBUG', true );
+define( 'MULTISITE', true );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/** MySQL database username */
-define('DB_USER', 'root');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/** Error logging configurations */
+ini_set( 'log_errors', 'On' );
+ini_set( 'display_errors', 'On' );
+ini_set( 'error_reporting', E_ALL );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/** MySQL database password */
-define('DB_PASSWORD', 'mysql');
-
-/** MySQL hostname */
-define('DB_HOST', 'wordcamp.db');
-
-/** Database Charset to use in creating database tables. */
-define('DB_CHARSET', 'utf8');
-
-/** The Database Collate type. Don't change this if in doubt. */
-define('DB_COLLATE', '');
-
-define( 'JETPACK_DEV_DEBUG', true);
-define( 'SAVEQUERIES', true );
-define( 'SCRIPT_DEBUG', true );
-define( 'MULTISITE', true );
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**#@+
</span><span class="cx" style="display: block; padding: 0 10px"> * Authentication Unique Keys and Salts.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,22 +33,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.6.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-define('AUTH_KEY', 'put your unique phrase here');
-define('SECURE_AUTH_KEY', 'put your unique phrase here');
-define('LOGGED_IN_KEY', 'put your unique phrase here');
-define('NONCE_KEY', 'put your unique phrase here');
-define('AUTH_SALT', 'put your unique phrase here');
-define('SECURE_AUTH_SALT', 'put your unique phrase here');
-define('LOGGED_IN_SALT', 'put your unique phrase here');
-define('NONCE_SALT', 'put your unique phrase here');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+define( 'AUTH_KEY', 'put your unique phrase here' );
+define( 'SECURE_AUTH_KEY', 'put your unique phrase here' );
+define( 'LOGGED_IN_KEY', 'put your unique phrase here' );
+define( 'NONCE_KEY', 'put your unique phrase here' );
+define( 'AUTH_SALT', 'put your unique phrase here' );
+define( 'SECURE_AUTH_SALT', 'put your unique phrase here' );
+define( 'LOGGED_IN_SALT', 'put your unique phrase here' );
+define( 'NONCE_SALT', 'put your unique phrase here' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/**#@-*/
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * WordPress Database Table prefix.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *
- * You can have multiple installations in one database if you give each
- * a unique prefix. Only numbers, letters, and underscores please!
</del><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited -- This is a correct and recommended place to define $table_prefix
</span><span class="cx" style="display: block; padding: 0 10px"> $table_prefix = 'wc_';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,25 +51,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * For developers: WordPress debugging mode.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Change this to true to enable the display of notices during development.
- * It is strongly recommended that plugin and theme developers use WP_DEBUG
- * in their development environments.
- *
- * For information on other constants that can be used for debugging,
- * visit the Codex.
- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @link https://codex.wordpress.org/Debugging_in_WordPress
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-define('WP_DEBUG', true);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+define( 'WP_DEBUG', true );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/* That's all, stop editing! Happy blogging. */
-
-/** Absolute path to the WordPress directory. */
-if ( ! defined('ABSPATH') ) {
- define( 'ABSPATH', dirname( __FILE__ ) . '/' );
-}
-
- /*
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/*
</ins><span class="cx" style="display: block; padding: 0 10px"> * Some code (like .config) is shared between WordCamp.org from other WordPress.org sites.
</span><span class="cx" style="display: block; padding: 0 10px"> * This constant can be used in that code to distinguish between the sites, without having to
</span><span class="cx" style="display: block; padding: 0 10px"> * check hostnames, which can be impractical on Multisite.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -99,18 +63,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> define( 'IS_WORDCAMP_NETWORK', true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Set central blog_id as base site to access network admin.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-define( 'PATH_CURRENT_SITE', '/' );
-define( 'SITE_ID_CURRENT_SITE', 1 );
-define( 'BLOG_ID_CURRENT_SITE', 2 ); // Set central.wordcamp.org as main site in network.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+define( 'PATH_CURRENT_SITE', '/' );
+define( 'SITE_ID_CURRENT_SITE', 1 );
+define( 'BLOG_ID_CURRENT_SITE', 2 ); // Set central.wordcamp.org as main site in network.
+define( 'DOMAIN_CURRENT_SITE', 'wordcamp.test' );
+define( 'CLI_HOSTNAME_OVERRIDE', 'wordcamp.test' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-define( 'WP_ALLOW_MULTISITE', true ); // @todo - temporary workaround for https://github.com/Automattic/wp-super-cache/issues/97.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+define( 'WP_ALLOW_MULTISITE', true ); // @todo - temporary workaround for https://github.com/Automattic/wp-super-cache/issues/97.
</ins><span class="cx" style="display: block; padding: 0 10px"> define( 'SUBMITDISABLED', false ); // work around https://github.com/Automattic/wp-super-cache/issues/213.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-define( 'SUBDOMAIN_INSTALL', true );
-// External users tables
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+define( 'SUBDOMAIN_INSTALL', true );
+
+// External users tables.
</ins><span class="cx" style="display: block; padding: 0 10px"> define( 'CUSTOM_USER_TABLE', 'wc_users' );
</span><span class="cx" style="display: block; padding: 0 10px"> define( 'CUSTOM_USER_META_TABLE', 'wc_usermeta' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-define( 'WP_DEBUG_LOG', true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+define( 'WP_DEBUG_LOG', true );
</ins><span class="cx" style="display: block; padding: 0 10px"> define( 'WP_DEBUG_DISPLAY', true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> define( 'SLACK_ERROR_REPORT_URL', '(Optional) you can configure slack and add your webhook url. Errors will be posted to this slack url' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -119,11 +87,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /** Sets up WordPress vars and included files. */
</span><span class="cx" style="display: block; padding: 0 10px"> define( 'WORDCAMP_ENVIRONMENT', 'development' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-define('WORDCAMP_CAMPTIX_STRIPE_TEST_PUBLIC', '(Optional) add stripe test public key');
-define('WORDCAMP_CAMPTIX_STRIPE_TEST_SECRET', '(Optional) add stripe test secret key');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+define( 'WORDCAMP_CAMPTIX_STRIPE_TEST_PUBLIC', '(Optional) add stripe test public key');
+define( 'WORDCAMP_CAMPTIX_STRIPE_TEST_SECRET', '(Optional) add stripe test secret key');
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-define( 'WPLANG', '' );
-define( 'WP_CONTENT_DIR', dirname( __FILE__ ) . '/wp-content' );
-define( 'FORCE_SSL_ADMIN', true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+define( 'WPLANG', '' );
+define( 'WP_CONTENT_DIR', dirname( __FILE__ ) . '/wp-content' );
+define( 'FORCE_SSL_ADMIN', true );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+define( 'WP_CONTENT_URL', 'http://' . preg_replace( '/[^-_.0-9a-z:]/i', '', $_SERVER['HTTP_HOST'] ) . '/wp-content' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> require_once(ABSPATH . 'wp-settings.php');
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/* That's all, stop editing! Happy blogging. */
+
+/** Absolute path to the WordPress directory. */
+if ( ! defined('ABSPATH') ) {
+ define( 'ABSPATH', dirname( __FILE__ ) . '/' );
+}
</ins></span></pre></div>
<a id="sitestrunkwordcamporggitignore"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/.gitignore</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/.gitignore 2019-05-20 11:52:34 UTC (rev 8820)
+++ sites/trunk/wordcamp.org/.gitignore 2019-05-20 11:52:41 UTC (rev 8821)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,3 +1,2 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ./public_html/wp-content/mu-plugins/blocks/assets/blocks.min*
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.data/
-.idea
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.docker/data/
</ins></span></pre></div>
<a id="sitestrunkwordcamporgdockercomposeyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/docker-compose.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/docker-compose.yml 2019-05-20 11:52:34 UTC (rev 8820)
+++ sites/trunk/wordcamp.org/docker-compose.yml 2019-05-20 11:52:41 UTC (rev 8821)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,6 +23,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> context: .docker
</span><span class="cx" style="display: block; padding: 0 10px"> dockerfile: mysql.Dockerfile
</span><span class="cx" style="display: block; padding: 0 10px"> volumes:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - ".data:/var/lib/mysql"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - ".docker/database:/var/lib/mysql"
</ins><span class="cx" style="display: block; padding: 0 10px"> ports:
</span><span class="cx" style="display: block; padding: 0 10px"> - "3307:3306"
</span></span></pre></div>
<a id="sitestrunkwordcamporgreadmemd"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/readme.md</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/readme.md 2019-05-20 11:52:34 UTC (rev 8820)
+++ sites/trunk/wordcamp.org/readme.md 2019-05-20 11:52:41 UTC (rev 8821)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,7 +10,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> 1. If you'd like to only setup WordCamp.org and would like to use Docker, you can use inbuilt docker provisioning. Please follow these steps
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- **Note:** This will create `.data` directory which will contain MySQL files to persist data across docker restarts.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ **Note:** This will create `.docker/database` directory which will contain MySQL files to persist data across docker restarts.
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> 1. Make sure you have Docker installed and Docker daemon running on your system.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,8 +56,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> 1. Activate plugin or apply theme as needed.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 1. (Optional) By default, docker will start with data defined in `.docker/wordcamp_dev.sql` and changes to data will be persisted across runs. To start with different database, delete `.data` directory and replace the `.docker/wordcamp_dev.sql` file and run `docker-compose up --build` again.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 1. (Optional) By default, docker will start with data defined in `.docker/wordcamp_dev.sql` and changes to data will be persisted across runs in `.docker/database`. To start with different database, delete `.docker/database` directory and replace the `.docker/wordcamp_dev.sql` file and run `docker-compose up --build` again.
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> After first time provisioning, docker can be started by using `docker-compose up` command from inside the directory.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-To contribute, you can send pull requests to this repo, or add patches to https://meta.trac.wordpress.org/.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+To contribute, you can send [pull requests on GitHub](https://github.com/WordPress/wordcamp.org/), or add [patches on Meta Trac](https://make.wordpress.org/meta/handbook/about/get-involved/learn-how-to-contribute-code/#share-your-new-code).
</ins></span></pre>
</div>
</div>
</body>
</html>