From e6571ec6fd0c2449ca03d3ee0b1badb5829da355 Mon Sep 17 00:00:00 2001 From: Nikolai Kristiansen Date: Tue, 15 Oct 2013 21:45:52 +0200 Subject: [PATCH] Salt updates --- dusken/urls.py | 1 - salt/roots/devtools/init.sls | 5 +++++ salt/roots/django/init.sls | 2 +- salt/roots/requirements/init.sls | 1 - salt/roots/top.sls | 1 + 5 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 salt/roots/devtools/init.sls delete mode 100644 salt/roots/requirements/init.sls diff --git a/dusken/urls.py b/dusken/urls.py index 38ad47d..3d92cac 100644 --- a/dusken/urls.py +++ b/dusken/urls.py @@ -1,4 +1,3 @@ -from django.conf.urls import * from django.conf.urls import patterns, include, url from django.contrib import admin from tastypie.api import Api diff --git a/salt/roots/devtools/init.sls b/salt/roots/devtools/init.sls new file mode 100644 index 0000000..c5153e6 --- /dev/null +++ b/salt/roots/devtools/init.sls @@ -0,0 +1,5 @@ +packages: + pkg.installed: + - names: + - vim + - git diff --git a/salt/roots/django/init.sls b/salt/roots/django/init.sls index e8528ed..4f89e2d 100644 --- a/salt/roots/django/init.sls +++ b/salt/roots/django/init.sls @@ -7,7 +7,7 @@ django: - postgresql-server-dev-9.1 -/home/vagrant/dusken/venv: +/vagrant/dusken/venv: virtualenv.managed: - no_site_packages: True - runas: vagrant diff --git a/salt/roots/requirements/init.sls b/salt/roots/requirements/init.sls deleted file mode 100644 index 9186b10..0000000 --- a/salt/roots/requirements/init.sls +++ /dev/null @@ -1 +0,0 @@ -packages: diff --git a/salt/roots/top.sls b/salt/roots/top.sls index 06bd4b6..bcb3297 100644 --- a/salt/roots/top.sls +++ b/salt/roots/top.sls @@ -1,4 +1,5 @@ base: '*': + - devtools - postgresql - django