From f042b6ae38a2e7b17d0802d165040a5174c2c581 Mon Sep 17 00:00:00 2001 From: carnage Date: Fri, 13 Nov 2015 14:53:34 +0000 Subject: [PATCH 1/9] Added avoid committing sensitive info to source control --- _posts/10-05-01-Configuration-Files.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/_posts/10-05-01-Configuration-Files.md b/_posts/10-05-01-Configuration-Files.md index e864bda..afb7c0b 100644 --- a/_posts/10-05-01-Configuration-Files.md +++ b/_posts/10-05-01-Configuration-Files.md @@ -13,4 +13,5 @@ via the file system. - If you must store your configuration files in the document root, name the files with a `.php` extension. This ensures that, even if the script is accessed directly, it will not be output as plain text. - Information in configuration files should be protected accordingly, either through encryption or group/user file -system permissions \ No newline at end of file +system permissions. +- It is a good idea to ensure that you do not commit configuration files containing sensitive information eg passwords or API tokens to source control. From 757c382066c0fb9d545b2ac340bc131519b4b42c Mon Sep 17 00:00:00 2001 From: Chris Hartjes Date: Wed, 25 Nov 2015 14:44:22 -0500 Subject: [PATCH 2/9] Added a link to Chris Tankersley's blog post about what tools he uses to do PHP dev work on Windows --- _posts/01-05-01-Windows-Setup.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/_posts/01-05-01-Windows-Setup.md b/_posts/01-05-01-Windows-Setup.md index 9265acf..46990fb 100644 --- a/_posts/01-05-01-Windows-Setup.md +++ b/_posts/01-05-01-Windows-Setup.md @@ -21,6 +21,8 @@ Generally running your application on different environment in development and p live. If you are developing on Windows and deploying to Linux (or anything non-Windows) then you should consider using a Virtual Machine. This sounds tricky, but using [Vagrant][vagrant] you can set up simple wrappers, then using [Puppet][puppet] or [Chef][chef] you can provision these boxes and share them with your colleagues to ensure you're all working on the same stack. More on this soon. +Chris Tankersley has a very helpful blog post on what tools he uses to do [PHP development using Windows][windows-tools]. + [php-downloads]: http://windows.php.net [phpmanager]: http://phpmanager.codeplex.com/ [wpi]: http://www.microsoft.com/web/downloads/platform.aspx @@ -29,4 +31,5 @@ sounds tricky, but using [Vagrant][vagrant] you can set up simple wrappers, then [php-iis]: http://php.iis.net/ [vagrant]: http://vagrantup.com/ [puppet]: http://www.puppetlabs.com/ -[chef]: http://www.opscode.com/ \ No newline at end of file +[chef]: http://www.opscode.com/ +[windows-tools]: http://ctankersley.com/2015/07/01/developing-on-windows/ From f8dbd2036112b86368415af45084c284af48e0b3 Mon Sep 17 00:00:00 2001 From: Ori Pekelman Date: Fri, 27 Nov 2015 11:11:04 +0100 Subject: [PATCH 3/9] propose platform.sh --- _posts/16-05-01-PHP-PaaS-Providers.md | 1 + 1 file changed, 1 insertion(+) diff --git a/_posts/16-05-01-PHP-PaaS-Providers.md b/_posts/16-05-01-PHP-PaaS-Providers.md index 8f57dcc..28f4eab 100644 --- a/_posts/16-05-01-PHP-PaaS-Providers.md +++ b/_posts/16-05-01-PHP-PaaS-Providers.md @@ -17,3 +17,4 @@ anchor: php_paas_providers * [Windows Azure](http://www.windowsazure.com/) * [Google App Engine](https://developers.google.com/appengine/docs/php/gettingstarted/) * [Jelastic](http://jelastic.com/) +* [Platform.sh](https://platform.sh/) \ No newline at end of file From 391348f47b48110f080425f7c6dc7927fbb9e9f1 Mon Sep 17 00:00:00 2001 From: Evgen Date: Mon, 21 Dec 2015 17:27:03 +0200 Subject: [PATCH 4/9] Open Server Open Server - a portable server platform and software environment designed specifically for web developers, taking into account their recommendations and suggestions. --- _posts/01-05-01-Windows-Setup.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/_posts/01-05-01-Windows-Setup.md b/_posts/01-05-01-Windows-Setup.md index 90c81c1..45d58f7 100644 --- a/_posts/01-05-01-Windows-Setup.md +++ b/_posts/01-05-01-Windows-Setup.md @@ -9,7 +9,7 @@ You can download the binaries from [windows.php.net/download][php-downloads]. Af For learning and local development you can use the built in webserver with PHP 5.4+ so you don't need to worry about configuring it. If you would like an "all-in-one" which includes a full-blown webserver and MySQL too then tools such -as the [Web Platform Installer][wpi], [XAMPP][xampp], [EasyPHP][easyphp] and [WAMP][wamp] will +as the [Web Platform Installer][wpi], [XAMPP][xampp], [EasyPHP][easyphp], [OpenServer][openserver] and [WAMP][wamp] will help get a Windows development environment up and running fast. That said, these tools will be a little different from production so be careful of environment differences if you are working on Windows and deploying to Linux. @@ -23,6 +23,7 @@ there is a [dedicated area on iis.net][php-iis] for PHP. [windows-path]: http://www.windows-commandline.com/set-path-command-line/ [wpi]: http://www.microsoft.com/web/downloads/platform.aspx [xampp]: http://www.apachefriends.org/en/xampp.html +[openserver]: http://open-server.ru/ [easyphp]: http://www.easyphp.org/ [wamp]: http://www.wampserver.com/en/ [phpmanager]: http://phpmanager.codeplex.com/ From b772796804ab93eaaa49fd5a29c6d227a8e4f57e Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Sat, 13 Feb 2016 13:56:28 +0100 Subject: [PATCH 5/9] Update configuration for Jekyll 3 --- _config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_config.yml b/_config.yml index 8f818c5..7bdf95a 100644 --- a/_config.yml +++ b/_config.yml @@ -1,6 +1,4 @@ baseurl: / -highlighter: pygments -markdown: kramdown permalink: date maruku: use_tex: false @@ -20,3 +18,5 @@ defaults: sitemap: false exclude: ['CNAME', 'CONTRIBUTING.md', 'LICENSE', 'README.md', 'pages/example.md'] + +future: true From 4d01e531d31f08eb84089deafd91a3a7c397db3b Mon Sep 17 00:00:00 2001 From: Jonathan Reinink Date: Sat, 13 Feb 2016 12:08:19 -0500 Subject: [PATCH 6/9] Enable Rouge highlighter and CSS styles. --- _config.yml | 2 +- _layouts/default.html | 1 + _layouts/page.html | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index 8f818c5..feaedce 100644 --- a/_config.yml +++ b/_config.yml @@ -1,5 +1,5 @@ baseurl: / -highlighter: pygments +highlighter: rouge markdown: kramdown permalink: date maruku: diff --git a/_layouts/default.html b/_layouts/default.html index 2316d50..eace5e4 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -15,6 +15,7 @@ + diff --git a/_layouts/page.html b/_layouts/page.html index c490675..97f3162 100644 --- a/_layouts/page.html +++ b/_layouts/page.html @@ -15,6 +15,7 @@ + From 66ce6df89f21e2a666263adc1adf9d06e030e4ef Mon Sep 17 00:00:00 2001 From: Chris Hartjes Date: Wed, 25 Nov 2015 14:44:22 -0500 Subject: [PATCH 7/9] Added a link to Chris Tankersley's blog post about what tools he uses to do PHP dev work on Windows --- _posts/01-05-01-Windows-Setup.md | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/_posts/01-05-01-Windows-Setup.md b/_posts/01-05-01-Windows-Setup.md index 45d58f7..5d32e19 100644 --- a/_posts/01-05-01-Windows-Setup.md +++ b/_posts/01-05-01-Windows-Setup.md @@ -17,14 +17,16 @@ If you need to run your production system on Windows then IIS7 will give you the can use [phpmanager][phpmanager] (a GUI plugin for IIS7) to make configuring and managing PHP simple. IIS7 comes with FastCGI built in and ready to go, you just need to configure PHP as a handler. For support and additional resources there is a [dedicated area on iis.net][php-iis] for PHP. - - -[php-downloads]: http://windows.php.net/download/ -[windows-path]: http://www.windows-commandline.com/set-path-command-line/ -[wpi]: http://www.microsoft.com/web/downloads/platform.aspx -[xampp]: http://www.apachefriends.org/en/xampp.html -[openserver]: http://open-server.ru/ + +Chris Tankersley has a very helpful blog post on what tools he uses to do [PHP development using Windows][windows-tools]. + +[phpmanager]: http://phpmanager.codeplex.com/ +[openserver]: http://open-server.ru/ [easyphp]: http://www.easyphp.org/ [wamp]: http://www.wampserver.com/en/ -[phpmanager]: http://phpmanager.codeplex.com/ -[php-iis]: http://php.iis.net/ +[php-downloads]: http://windows.php.net/download/ +[php-iis]: http://php.iis.net// +[windows-path]: http://www.windows-commandline.com/set-path-command-line/ +[windows-tools]: http://ctankersley.com/2015/07/01/developing-on-windows/ +[wpi]: http://www.microsoft.com/web/downloads/platform.aspx +[xampp]: http://www.apachefriends.org/en/xampp.html From 63a44c76d424c12e735b3378f187296f94118ec1 Mon Sep 17 00:00:00 2001 From: Phil Sturgeon Date: Sun, 14 Feb 2016 13:22:22 -0500 Subject: [PATCH 8/9] Use bundle for gems --- Gemfile | 2 + Gemfile.lock | 129 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 131 insertions(+) create mode 100644 Gemfile create mode 100644 Gemfile.lock diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000..053c27d --- /dev/null +++ b/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'github-pages' diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000..a5e7093 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,129 @@ +GEM + remote: https://rubygems.org/ + specs: + RedCloth (4.2.9) + activesupport (4.2.5.1) + i18n (~> 0.7) + json (~> 1.7, >= 1.7.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) + addressable (2.3.8) + coffee-script (2.4.1) + coffee-script-source + execjs + coffee-script-source (1.10.0) + colorator (0.1) + ethon (0.8.1) + ffi (>= 1.3.0) + execjs (2.6.0) + faraday (0.9.2) + multipart-post (>= 1.2, < 3) + ffi (1.9.10) + gemoji (2.1.0) + github-pages (48) + RedCloth (= 4.2.9) + github-pages-health-check (= 0.6.1) + jekyll (= 3.0.3) + jekyll-coffeescript (= 1.0.1) + jekyll-feed (= 0.3.1) + jekyll-gist (= 1.4.0) + jekyll-mentions (= 1.0.0) + jekyll-paginate (= 1.1.0) + jekyll-redirect-from (= 0.9.1) + jekyll-sass-converter (= 1.3.0) + jekyll-seo-tag (= 1.0.0) + jekyll-sitemap (= 0.10.0) + jekyll-textile-converter (= 0.1.0) + jemoji (= 0.5.1) + kramdown (= 1.9.0) + liquid (= 3.0.6) + mercenary (~> 0.3) + rdiscount (= 2.1.8) + redcarpet (= 3.3.3) + rouge (= 1.10.1) + terminal-table (~> 1.4) + github-pages-health-check (0.6.1) + addressable (~> 2.3) + net-dns (~> 0.8) + public_suffix (~> 1.4) + typhoeus (~> 0.7) + html-pipeline (2.3.0) + activesupport (>= 2, < 5) + nokogiri (>= 1.4) + i18n (0.7.0) + jekyll (3.0.3) + colorator (~> 0.1) + jekyll-sass-converter (~> 1.0) + jekyll-watch (~> 1.1) + kramdown (~> 1.3) + liquid (~> 3.0) + mercenary (~> 0.3.3) + rouge (~> 1.7) + safe_yaml (~> 1.0) + jekyll-coffeescript (1.0.1) + coffee-script (~> 2.2) + jekyll-feed (0.3.1) + jekyll-gist (1.4.0) + octokit (~> 4.2) + jekyll-mentions (1.0.0) + html-pipeline (~> 2.2) + jekyll (~> 3.0) + jekyll-paginate (1.1.0) + jekyll-redirect-from (0.9.1) + jekyll (>= 2.0) + jekyll-sass-converter (1.3.0) + sass (~> 3.2) + jekyll-seo-tag (1.0.0) + jekyll (>= 2.0) + jekyll-sitemap (0.10.0) + jekyll-textile-converter (0.1.0) + RedCloth (~> 4.0) + jekyll-watch (1.3.1) + listen (~> 3.0) + jemoji (0.5.1) + gemoji (~> 2.0) + html-pipeline (~> 2.2) + jekyll (>= 2.0) + json (1.8.3) + kramdown (1.9.0) + liquid (3.0.6) + listen (3.0.6) + rb-fsevent (>= 0.9.3) + rb-inotify (>= 0.9.7) + mercenary (0.3.5) + mini_portile2 (2.0.0) + minitest (5.8.4) + multipart-post (2.0.0) + net-dns (0.8.0) + nokogiri (1.6.7.2) + mini_portile2 (~> 2.0.0.rc2) + octokit (4.2.0) + sawyer (~> 0.6.0, >= 0.5.3) + public_suffix (1.5.3) + rb-fsevent (0.9.7) + rb-inotify (0.9.7) + ffi (>= 0.5.0) + rdiscount (2.1.8) + redcarpet (3.3.3) + rouge (1.10.1) + safe_yaml (1.0.4) + sass (3.4.21) + sawyer (0.6.0) + addressable (~> 2.3.5) + faraday (~> 0.8, < 0.10) + terminal-table (1.5.2) + thread_safe (0.3.5) + typhoeus (0.8.0) + ethon (>= 0.8.0) + tzinfo (1.2.2) + thread_safe (~> 0.1) + +PLATFORMS + ruby + +DEPENDENCIES + github-pages + +BUNDLED WITH + 1.10.6 From ebc809b9bf756ec1d61ce1827dde0d959fc6d4fd Mon Sep 17 00:00:00 2001 From: Phil Sturgeon Date: Mon, 15 Feb 2016 12:33:22 -0500 Subject: [PATCH 9/9] Calm down double slash --- _posts/01-05-01-Windows-Setup.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_posts/01-05-01-Windows-Setup.md b/_posts/01-05-01-Windows-Setup.md index 503eed3..e916c91 100644 --- a/_posts/01-05-01-Windows-Setup.md +++ b/_posts/01-05-01-Windows-Setup.md @@ -28,7 +28,7 @@ Chris Tankersley has a very helpful blog post on what tools he uses to do [PHP d [openserver]: http://open-server.ru/ [wamp]: http://www.wampserver.com/en/ [php-downloads]: http://windows.php.net/download/ -[php-iis]: http://php.iis.net// +[php-iis]: http://php.iis.net/ [windows-path]: http://www.windows-commandline.com/set-path-command-line/ [windows-tools]: http://ctankersley.com/2015/07/01/developing-on-windows/ [wpi]: http://www.microsoft.com/web/downloads/platform.aspx