Pushing

diff --git a/.htaccess b/.htaccess
index 92b5485a1bc5bddf134345971ddeb20d431a5fb6..b4fb8cfda3cb4b45b480fa657ba86caccfb029df 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -1,5 +1,6 @@
-Options +FollowSymLinks
+Options +FollowSymLinks -MultiViews
 RewriteEngine On
+RewriteBase /
 
 RewriteCond %{HTTPS} !=on
 RewriteRule ^(.*) https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301]
@@ -7,4 +8,8 @@ Header always set Content-Security-Policy "upgrade-insecure-requests;"
 
 RewriteCond %{REQUEST_FILENAME} !-f
 RewriteCond %{REQUEST_FILENAME} !-d
-RewriteRule (.*) index.php?p=$1 [L]
+RewriteCond %{REQUEST_FILENAME}\.html -f
+RewriteRule ^(.*)$ $1.html [L]
+
+RewriteCond %{THE_REQUEST} ^(?:GET|POST)\ /.*\.html\ HTTP.*$ [NC]
+RewriteRule ^(.*)\.html$ $1 [R=301,L]

diff --git a/_config.yml b/_config.yml
index 3a7c6c38d03e2e163a147f53bcea1a25a37b23cb..0fadc28a52c72d084eba19c9e330a017ac4a9e5e 100644 (file)
--- a/_config.yml
+++ b/_config.yml
@@ -2,7 +2,7 @@ title: quilime.com
 baseurl: ""
 url: "https://quilime.com"
 excerpt_separator: "<!--more-->"
-permalink: /:categories/:title:output_ext
+permalink: /:title:output_ext
 plugins:
   - jekyll-feed
   - jekyll-paginate
@@ -26,3 +26,5 @@ exclude:
   - vendor/gems/
   - vendor/ruby/
   - serve
+  - publish
+

diff --git a/_layouts/index.html b/_layouts/index.html
index 9129febec8a7ff898b4c9f5031eef099e540c5e0..a2a3a527bca157d16f15fe233f20c14896a2737a 100644 (file)
--- a/_layouts/index.html
+++ b/_layouts/index.html
@@ -19,8 +19,8 @@
     <div id="nav">
         <ul>
           <li><a href="{{site.url}}/">home</a></li>
-          <li><a href="{{ site.url }}/all/">all entries</a></li>
-          <li><a href="{{ site.url }}/about/">about</a></li>    
+          <li><a href="{{ site.url }}/all">all entries</a></li>
+          <li><a href="{{ site.url }}/about">about</a></li>    
           <li><br /></li>
           <li><a href="{{ site.url }}/feed.xml">rss</a></li>      
         </ul>

diff --git a/publish b/publish
new file mode 100755 (executable)
index 0000000..ddd8cf7
--- /dev/null
+++ b/publish
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+echo "Building..."
+rm -rf _site
+bundle exec jekyll build --config _config.yml
+echo "Syncing..."
+rsync -varz _site/ quilime@quilime.com:/home/quilime/quilime.com/public/ --delete $EXCLUDE