diff --git a/pillar/top.sls b/pillar/top.sls index ddb8304..8af37ef 100644 --- a/pillar/top.sls +++ b/pillar/top.sls @@ -1,5 +1,5 @@ base: - 'local.snipt.net': - - vagrant '*': - production + 'local.snipt.net': + - vagrant diff --git a/salt/application/init.sls b/salt/application/init.sls index 5f822db..9d982cf 100644 --- a/salt/application/init.sls +++ b/salt/application/init.sls @@ -33,6 +33,7 @@ virtualenvwrapper: git.latest: - name: https://github.com/nicksergeant/snipt.git + - rev: master - target: /var/www/snipt - user: deploy diff --git a/salt/fish/config.fish b/salt/fish/config.fish index 1ecb39e..91dd43d 100644 --- a/salt/fish/config.fish +++ b/salt/fish/config.fish @@ -89,12 +89,12 @@ end # Virtualenv {{{ set -x WORKON_HOME '/var/www/.virtualenvs' -source ~/.config/fish/virtualenv.fish +. ~/.config/fish/virtualenv.fish # }}} # Z {{{ -source /etc/z.fish +. /etc/z.fish function j z $argv diff --git a/snipts/api.py b/snipts/api.py index 1ead73c..dfa8084 100644 --- a/snipts/api.py +++ b/snipts/api.py @@ -222,6 +222,10 @@ class PublicSniptResource(ModelResource): bundle.data['raw_url'] = bundle.obj.get_raw_url() bundle.data['full_absolute_url'] = bundle.obj.get_full_absolute_url() bundle.data['description_rendered'] = linebreaksbr(urlize(bundle.obj.description)) + + if 'omit_code' in bundle.request.GET: + del bundle.data['code'] + return bundle def build_filters(self, filters=None):