Update readme and change wp-config file name

so the sample file doesn't get ignored by deploy-exclude

Author: Jordalgo

docker-entrypoint-wordpress.sh

@@ -24,10 +24,10 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
 	# version 4.4.1 decided to switch to windows line endings, that breaks our seds and awks
 	# https://github.com/docker-library/wordpress/issues/116
 	# https://github.com/WordPress/WordPress/commit/1acedc542fba2482bab88ec70d4bea4b997a92e4
-	sed -ri 's/\r\n|\r/\n/g' ./setup/wp-config*
+	sed -ri 's/\r\n|\r/\n/g' ./setup/wp-config-sample*
 
 	if [ ! -e wp-config.php ]; then
-		awk '/^\/\*.*stop editing.*\*\/$/ && c == 0 { c = 1; system("cat") } { print }' ./setup/wp-config.php > wp-config.php <<'EOPHP'
+		awk '/^\/\*.*stop editing.*\*\/$/ && c == 0 { c = 1; system("cat") } { print }' ./setup/wp-config-sample.php > wp-config.php <<'EOPHP'
 // If we're behind a proxy server and using HTTPS, we need to alert Wordpress of that fact
 // see also http://codex.wordpress.org/Administration_Over_SSL#Using_a_Reverse_Proxy
 if (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https') {

setup/README.md

@@ -34,8 +34,8 @@ This current setup uses `rsync` via `deploy.sh` (which was copied into the root
 Update the `deploy.sh` file by changing USERNAME, DOMAIN, and FOLDER to match your remote server's information. Then you can run `sh deploy.sh`.
 
 On your server:
-- `cp setup/htaccess-remote .htaccess` (this version has more security settings)
-- `cp setup/wp-config.php wp-config.php`. Then update the database values to match what you have configured with your web host AND fill in the unique keys and salts ([generate these](https://api.wordpress.org/secret-key/1.1/salt)). It's also a good idea to change the table prefix from `wp_` to something unique.
+- `cp setup/htaccess-remote .htaccess` (this version has more security settings but you will need to update it with your site details).
+- `cp setup/wp-config-sample.php wp-config.php`. Then update the database values to match what you have configured with your web host AND fill in the unique keys and salts ([generate these](https://api.wordpress.org/secret-key/1.1/salt)). It's also a good idea to change the table prefix from `wp_` to something unique.
 
 ## More Details