diff options
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | Gemfile.lock | 9 | ||||
| -rw-r--r-- | config.rb | 19 | ||||
| -rw-r--r-- | source/layouts/layout.erb | 2 |
4 files changed, 31 insertions, 2 deletions
@@ -8,6 +8,9 @@ gem "middleman-blog", "~> 3.5.2" # Live-reloading plugin gem "middleman-livereload" +# Deployment +gem "middleman-deploy" + # For faster file watcher updates on Windows: gem "wdm", "~> 0.1.0", :platforms => [:mswin, :mingw] diff --git a/Gemfile.lock b/Gemfile.lock index a493760..17095fc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -70,6 +70,10 @@ GEM rack-test (~> 0.6.2) thor (>= 0.15.2, < 2.0) tilt (~> 1.4.1, < 2.0) + middleman-deploy (0.2.4) + middleman-core (>= 3.0.0) + net-sftp + ptools middleman-livereload (3.3.2) em-websocket (~> 0.5.0) middleman-core (~> 3.2) @@ -82,6 +86,9 @@ GEM mini_portile (0.5.3) minitest (4.7.5) multi_json (1.9.2) + net-sftp (2.1.2) + net-ssh (>= 2.6.5) + net-ssh (2.9.1) nokogiri (1.6.1) mini_portile (~> 0.5.0) padrino-helpers (0.12.1) @@ -90,6 +97,7 @@ GEM tilt (~> 1.4.1) padrino-support (0.12.1) activesupport (>= 3.1) + ptools (1.2.4) rack (1.5.2) rack-livereload (0.3.15) rack @@ -128,6 +136,7 @@ DEPENDENCIES builder (~> 3.0) middleman (~> 3.3.2) middleman-blog (~> 3.5.2) + middleman-deploy middleman-livereload nokogiri wdm (~> 0.1.0) @@ -35,6 +35,21 @@ end page "/feed.xml", layout: false ### +# Deployment +### + +activate :deploy do |deploy| + deploy.method = :rsync + deploy.host = "www.np.tl" + deploy.path = "/var/www/np.tl/htdocs/web3" + # Optional Settings + # deploy.user = "tvaughan" # no default + # deploy.port = 5309 # ssh port, default: 22 + # deploy.clean = true # remove orphaned files on remote host, default: false + # deploy.flags = "-rltgoDvzO --no-p --del" # add custom flags, default: -avz +end + +### # Compass ### @@ -87,6 +102,8 @@ set :js_dir, 'javascripts' set :images_dir, 'images' +set :relative_links, true + # Build-specific configuration configure :build do # For example, change the Compass output style for deployment @@ -99,7 +116,7 @@ configure :build do # activate :asset_hash # Use relative URLs - # activate :relative_assets + activate :relative_assets # Or use a different image path # set :http_prefix, "/Content/images/" diff --git a/source/layouts/layout.erb b/source/layouts/layout.erb index 8c4fea3..030e78c 100644 --- a/source/layouts/layout.erb +++ b/source/layouts/layout.erb @@ -23,7 +23,7 @@ <!-- header --> <header> <div id="logo"> - <% link_to '/' do %> + <% link_to '/index.html' do %> <%= image_tag 'sublab-logo.png', class: "img-responsive" %> <% end %> </div> |