Changes to config files to accomodate new direcotry structure

matachi · Jun 15, 2014 · d7cbde6 · d7cbde6
1 parent b4ef4d2
commit d7cbde6
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 11 deletions.
diff --git a/conf/nginx.conf b/conf/nginx.conf
@@ -1,5 +1,11 @@
 upstream hydra {
-    server unix:/hydra/mysite.sock;
+    server unix:/home/deploy/hydra/mysite.sock;
+}
+
+server {
+    listen      80;
+    server_name www.matachi.se;
+    return      301 http://matachi.se$request_uri;
 }
 
 server {
@@ -11,14 +17,17 @@ server {
     client_max_body_size 75M;
 
     location /media  {
-        alias /hydra/media;
+        alias /home/deploy/hydra/media;
     }
 
     location /static {
-        alias /hydra/static;
+        alias /home/deploy/hydra/static;
+        expires 30d;
+        log_not_found off;
     }
 
     location / {
+        add_header Content-Security-Policy "default-src http://matachi.se/static/; script-src 'self' http://fonts.googleapis.com http://code.jquery.com http://netdna.boostrapcdn.com https://gist.github.com/MaTachi/; style-src 'self' http://fonts.googleapis.com https://gist.github.com/assets/embed http://netdna.bootstrapcdn.com/font-awesome/; font-src http://netdna.bootstrapcdn.com/font-awesome/ http://themes.googleusercontent.com; frame-src https://www.facebook.com/ https://platform.twitter.com";
         uwsgi_pass  hydra;
         include     /etc/nginx/uwsgi_params;
     }

diff --git a/conf/uwsgi.ini b/conf/uwsgi.ini
@@ -2,11 +2,11 @@
 
 # Django-related settings
 # The base directory
-chdir           = /hydra
+chdir           = /home/deploy/hydra
 # Django's wsgi file
 module          = hydra.wsgi
 # The virtualenv
-home            = /hydra/env
+home            = /home/deploy/hydra/env
 
 env             = DJANGO_SETTINGS_MODULE=hydra.settings
 
@@ -16,14 +16,14 @@ master          = true
 # Maximum number of worker processes
 processes       = 4
 # The socket
-socket          = /hydra/mysite.sock
+socket          = /home/deploy/hydra/mysite.sock
 # Permissions
 chmod-socket    = 600
-chown-socket    = www-data
-uid             = www-data
-gid             = www-data
+chown-socket    = deploy
+uid             = deploy
+gid             = deploy
 # Clear environment on exit
 vacuum          = true
 
-daemonize       = /var/log/uwsgi/log.log
-pidfile         = /hydra/mysite.pid
+daemonize       = /home/deploy/uwsgi/log/hydra.log
+pidfile         = /home/deploy/hydra/mysite.pid