Skip to content

Commit

Permalink
Redesign static_root configuration, as it won't be as important now
Browse files Browse the repository at this point in the history
  • Loading branch information
cdchapman committed Nov 7, 2016
1 parent 282d5dd commit 913cb2e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion commands/view.rb
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def view_config
end

def view_config_root
view_config[:root_subdir]
view_config[:static_root]
end

def load_adsf
Expand Down
9 changes: 4 additions & 5 deletions nanoc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ enable_output_diff: true

# Config for Nanoc commands

view:
static_root: &static_root /static

deploy:
public:
kind: rsync
Expand All @@ -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: '>'
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -146,6 +148,3 @@ data_sources:
items_root: /static/specifications
content_dir: specifications/playground
layouts_dir: specifications/layouts

view:
root_subdir: *static_root

0 comments on commit 913cb2e

Please sign in to comment.