From 913cb2ecbf0988766171a75c3b58012f4d74f8ab Mon Sep 17 00:00:00 2001 From: Chris Chapman Date: Mon, 7 Nov 2016 15:13:19 -0700 Subject: [PATCH] Redesign static_root configuration, as it won't be as important now --- commands/view.rb | 2 +- nanoc.yaml | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/commands/view.rb b/commands/view.rb index df045040..79994f0d 100644 --- a/commands/view.rb +++ b/commands/view.rb @@ -61,7 +61,7 @@ def view_config end def view_config_root - view_config[:root_subdir] + view_config[:static_root] end def load_adsf diff --git a/nanoc.yaml b/nanoc.yaml index a17af39f..9e7fb43a 100644 --- a/nanoc.yaml +++ b/nanoc.yaml @@ -4,6 +4,9 @@ enable_output_diff: true # Config for Nanoc commands +view: + static_root: &static_root /static + deploy: public: kind: rsync @@ -29,7 +32,7 @@ checks: &checks environments: default: &default base_url: &base_url "https://pentandra.com" - static_root: &static_root "/static" + static_root: *static_root erb: trim_mode: '>' @@ -100,7 +103,6 @@ environments: production: &production <<: *default - static_root: '/srv/http/lifepreserver' require_git_tag: true # All production releases must be at a tag google_analytics: @@ -146,6 +148,3 @@ data_sources: items_root: /static/specifications content_dir: specifications/playground layouts_dir: specifications/layouts - -view: - root_subdir: *static_root