<!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>[6589] sites/trunk/wp15.wordpress.net: WP15: Explicitly name config files based on their security context.</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" 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/6589">6589</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/6589","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>iandunn</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-02-10 10:07:37 +0000 (Sat, 10 Feb 2018)</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'>WP15: Explicitly name config files based on their security context.
Using "wp-config.php" for public config is counter-intuitive, since that file traditionally stores sensitive information. This makes it obvious to anyone that there are separate files for public and private configuration, and reduces the risk of a developer unintentionally adding private configuration to the public file.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwp15wordpressnetgitignore">sites/trunk/wp15.wordpress.net/.gitignore</a></li>
<li><a href="#sitestrunkwp15wordpressnetpublic_htmlwpconfigphp">sites/trunk/wp15.wordpress.net/public_html/wp-config.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#sitestrunkwp15wordpressnetconfigpublicphp">sites/trunk/wp15.wordpress.net/config-public.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#sitestrunkwp15wordpressnet">sites/trunk/wp15.wordpress.net/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: sites/trunk/wp15.wordpress.net
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- sites/trunk/wp15.wordpress.net 2018-02-10 09:25:30 UTC (rev 6588)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ sites/trunk/wp15.wordpress.net 2018-02-10 10:07:37 UTC (rev 6589)
</ins><a id="sitestrunkwp15wordpressnet"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: sites/trunk/wp15.wordpress.net</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnignore"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:ignore</h4></div>
<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-local-config.php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+config-private.php
</ins><a id="sitestrunkwp15wordpressnetgitignore"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wp15.wordpress.net/.gitignore</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wp15.wordpress.net/.gitignore 2018-02-10 09:25:30 UTC (rev 6588)
+++ sites/trunk/wp15.wordpress.net/.gitignore 2018-02-10 10:07:37 UTC (rev 6589)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,7 +4,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> # of trunk (which isn't guaranteed to be stable), or specific tags (which are a hassle to keep updated).
</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">-local-config.php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+config-private.php
</ins><span class="cx" style="display: block; padding: 0 10px"> public_html/content/upgrade
</span><span class="cx" style="display: block; padding: 0 10px"> public_html/content/uploads
</span><span class="cx" style="display: block; padding: 0 10px"> public_html/content/themes/twentyfifteen
</span></span></pre></div>
<a id="sitestrunkwp15wordpressnetconfigpublicphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: sites/trunk/wp15.wordpress.net/config-public.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wp15.wordpress.net/config-public.php (rev 0)
+++ sites/trunk/wp15.wordpress.net/config-public.php 2018-02-10 10:07:37 UTC (rev 6589)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,38 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/*
+ * SECURITY WARNING: This file is _public_. Add passwords, etc to `config-private.php`.
+ */
+
+$table_prefix = 'wp_';
+
+define( 'DB_CHARSET', 'utf8mb4' );
+define( 'DB_COLLATE', '' );
+
+define( 'WP_CONTENT_URL', WP_HOME . '/content' );
+define( 'WP_SITEURL', WP_HOME . '/wordpress' );
+define( 'WP_CONTENT_DIR', __DIR__ . '/public_html/content' );
+//define( 'WPCACHEHOME', WP_CONTENT_DIR . '/plugins/wp-super-cache/' );
+//define( 'WP_CACHE', true );
+
+define( 'DISALLOW_FILE_EDIT', true );
+define( 'DISALLOW_UNFILTERED_HTML', true );
+
+if ( 'production' === WP15_ENVIRONMENT ) {
+ ini_set( 'display_errors', 0 );
+
+ define( 'WP_DEBUG_DISPLAY', false );
+ define( 'WP_DEBUG_LOG', true );
+ define( 'SCRIPT_DEBUG', false );
+ define( 'FORCE_SSL_ADMIN', true );
+} else {
+ define( 'SAVEQUERIES', true );
+ define( 'WP_DEBUG', true );
+ define( 'SCRIPT_DEBUG', true );
+}
+
+if ( ! defined( 'ABSPATH' ) ) {
+ define( 'ABSPATH', dirname( __FILE__ ) . '/' );
+}
+
+require_once( ABSPATH . 'wp-settings.php' );
</ins></span></pre></div>
<a id="sitestrunkwp15wordpressnetpublic_htmlwpconfigphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wp15.wordpress.net/public_html/wp-config.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wp15.wordpress.net/public_html/wp-config.php 2018-02-10 09:25:30 UTC (rev 6588)
+++ sites/trunk/wp15.wordpress.net/public_html/wp-config.php 2018-02-10 10:07:37 UTC (rev 6589)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,40 +1,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*
- * SECURITY WARNING: This file is _public_. Add passwords, etc to `local-config.php`.
- */
-
-require_once( dirname( __DIR__ ) . '/local-config.php' );
-
-$table_prefix = 'wp_';
-
-define( 'DB_CHARSET', 'utf8mb4' );
-define( 'DB_COLLATE', '' );
-
-define( 'WP_CONTENT_URL', WP_HOME . '/content' );
-define( 'WP_SITEURL', WP_HOME . '/wordpress' );
-define( 'WP_CONTENT_DIR', __DIR__ . '/content' );
-//define( 'WPCACHEHOME', WP_CONTENT_DIR . '/plugins/wp-super-cache/' );
-//define( 'WP_CACHE', true );
-
-define( 'DISALLOW_FILE_EDIT', true );
-define( 'DISALLOW_UNFILTERED_HTML', true );
-
-if ( 'production' === WP15_ENVIRONMENT ) {
- ini_set( 'display_errors', 0 );
-
- define( 'WP_DEBUG_DISPLAY', false );
- define( 'WP_DEBUG_LOG', true );
- define( 'SCRIPT_DEBUG', false );
- define( 'FORCE_SSL_ADMIN', true );
-} else {
- define( 'SAVEQUERIES', true );
- define( 'WP_DEBUG', true );
- define( 'SCRIPT_DEBUG', true );
-}
-
-if ( ! defined( 'ABSPATH' ) ) {
- define( 'ABSPATH', dirname( __FILE__ ) . '/' );
-}
-
-require_once( ABSPATH . 'wp-settings.php' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+require_once( dirname( __DIR__ ). '/config-private.php' );
+require_once( dirname( __DIR__ ). '/config-public.php' );
</ins></span></pre>
</div>
</div>
</body>
</html>