diff --git a/CHANGELOG.md b/CHANGELOG.md index 4338520..c770e3a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,11 @@ # CHANGELOG -## HEAD | 2.1.1 | 21.06.2017 +## 2.2.0 | 31.10.2017 +* change default local-domain to `.local` as `.dev` is an official gTLD now +* add ssh credentials to `Vagrantfile` * add `--hard` to rewrite flush to make sure .htaccess file is generated (Thanks to @XedinUnknown) +* Fix Typo ## 2.1.0 | 21.06.2017 * update setup for Scotch Box 3.0 (re-install WP-CLI for php7) diff --git a/README.md b/README.md index 53e051f..8b83e0d 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ![Screenshot](http://files.flurinduerst.ch/wpdistillery/wpdistillery_logo.png) -**Version 2.1.1** (22.08.2017) +**Version 2.2.0** (31.10.2017) Since V2.1.0 WPDistillery is fully compatible with Scotch Box 3.0 @@ -39,7 +39,7 @@ To setup a new project running Scotch Box and WordPress, simply follow these ste 3. in `Vagrantfile`, add your local URL at `config.vm.hostname` (This should be the same as `wpsettings:url:` in `config.yml`) 4. Run `vagrant up` inside your project root -Done! You can now access your project at the local URL defined in step 3. (or at http://192.168.33.10/) +Done! You can now access your project at the local URL (for example `yoursite.local`) defined in step 3. (or at http://192.168.33.10/) ## Additional Information diff --git a/README_CONFIG.md b/README_CONFIG.md index 285f284..fbe3bd7 100644 --- a/README_CONFIG.md +++ b/README_CONFIG.md @@ -58,7 +58,7 @@ db: ################################################################# wpsettings: - url: wpdistillery.dev + url: wpdistillery.local title: Example description: Example Description permalink_structure: /%postname%/ diff --git a/Vagrantfile b/Vagrantfile index 8f6f464..fa43cd6 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -3,16 +3,18 @@ # # WPDistillery Vagrantfile using Scotch Box # -# File Version: 1.0 +# File Version: 1.1 Vagrant.configure("2") do |config| + config.ssh.username = "vagrant" + config.ssh.password = "vagrant" config.vm.box = "scotch/box" config.vm.network "private_network", ip: "192.168.33.10" - config.vm.hostname = "wpdistillery.dev" + config.vm.hostname = "wpdistillery.local" config.vm.synced_folder ".", "/var/www", :mount_options => ["dmode=777", "fmode=666"] - # Windows Support + # WPDistillery Windows Support if Vagrant::Util::Platform.windows? config.vm.provision "shell", inline: "echo \"Converting Files for Windows\" && sudo apt-get install -y dos2unix && cd /var/www/ && dos2unix wpdistillery/config.yml && dos2unix wpdistillery/provision.sh && dos2unix wpdistillery/wpdistillery.sh", diff --git a/wpdistillery/config.yml b/wpdistillery/config.yml index 228cd4a..24f0704 100644 --- a/wpdistillery/config.yml +++ b/wpdistillery/config.yml @@ -6,7 +6,7 @@ # For detailed instructions on this file read the config.yml-documentation at # https://wpdistillery.org/documentation/config-yml-documentation/ # -# File Version: 1.6.4 +# File Version: 1.7.0 # INSTALLATION @@ -41,7 +41,7 @@ db: ################################################################# wpsettings: - url: wpdistillery.dev + url: wpdistillery.local title: Example Title description: Example Description permalink_structure: "/%postname%/" @@ -64,8 +64,8 @@ wpsettings: # theme to install, choose new name in 'rename' or leave empty theme: name: WPSeed - rename: "" url: "https://github.com/flurinduerst/WPSeed/archive/master.zip" + rename: "" # PLUGINS ################################################################# diff --git a/wpdistillery/wpdistillery.sh b/wpdistillery/wpdistillery.sh index 6975a62..209f3ca 100644 --- a/wpdistillery/wpdistillery.sh +++ b/wpdistillery/wpdistillery.sh @@ -5,7 +5,7 @@ # Author: Flurin Dürst # URL: https://wpdistillery.org # -# File version 1.7.1 +# File version 1.7.2 # ERROR Handler # ask user to continue on error @@ -78,7 +78,7 @@ if $CONF_setup_wp ; then wp core download --locale=$CONF_wplocale --version=$CONF_wpversion printf "${BLU}»»» creating wp-config...${NC}\n" wp core config --dbname=$CONF_db_name --dbuser=$CONF_db_user --dbpass=$CONF_db_pass --dbprefix=$CONF_db_prefix --locale=$CONF_wplocale - printf "${BLU}»»» installing wordpress...${NC}\n" + printf "${BLU}»»» installing WordPress...${NC}\n" wp core install --url=$CONF_wpsettings_url --title="$CONF_wpsettings_title" --admin_user=$CONF_admin_user --admin_password=$CONF_admin_password --admin_email=$CONF_admin_email --skip-email wp user update 1 --first_name=$CONF_admin_first_name --last_name=$CONF_admin_last_name else