Permalink
Browse files

Merge branch 'master' of github.com:yumike/djangolint

  • Loading branch information...
2 parents 7e6d4b7 + 839aeca commit 8f7fa980f6ff77ef22fae08b3a4c377553180419 @nyumatova nyumatova committed Jul 31, 2011
View
@@ -15,7 +15,7 @@ django projects and apps.
### Deployment
-1. Setup your server settings in fabfile (Ubuntu 10.10 only tested)
+1. Setup your server settings in fabfile (Ubuntu 11.04 only tested)
2. Run `fab bootstrap provision deploy`
### Todo
@@ -9,7 +9,7 @@ server {
keepalive_timeout 5;
- root /var/www/project/public;
+ root /usr/share/nginx/www/project/public;
location / {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -24,6 +24,6 @@ server {
error_page 500 502 503 504 /500.html;
location = /500.html {
- root /var/www/project;
+ root /usr/share/nginx/www/project;
}
}
@@ -24,7 +24,7 @@
not_if "cat /home/project/.profile | grep 'export PROJECT_ENV=#{node[:project][:environment]}'"
end
-directory "/var/www/project" do
+directory "/usr/share/nginx/www/project" do
owner "project"
group "project"
mode 0755
View
@@ -16,7 +16,8 @@ class CloningError(Exception):
def clone(url, clone_path):
- error = Popen(['git', 'clone', url, clone_path], stdout=PIPE, stderr=PIPE).wait()
+ error = Popen(['git', 'clone', '--depth=1', url, clone_path],
+ stdout=PIPE, stderr=PIPE).wait()
if error:
raise CloningError('Cloning %s repository failed' % url)
@@ -25,7 +25,9 @@
BROKER_PORT = 6379
BROKER_VHOST = '0'
-PUBLIC_ROOT = os.path.join(os.sep, 'var', 'www', 'project', 'public')
+PUBLIC_ROOT = os.path.join(
+ os.sep, 'usr', 'share', 'nginx', 'www', 'project', 'public'
+)
STATIC_ROOT = os.path.join(PUBLIC_ROOT, 'static')
MEDIA_ROOT = os.path.join(PUBLIC_ROOT, 'media')

0 comments on commit 8f7fa98

Please sign in to comment.