Slight project changes. Only todo: virtualenv.

gbagr · Jun 28, 2011 · 61f92a4 · 61f92a4
1 parent 2d2dce5
commit 61f92a4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/modules/apache2/templates/project.conf.erb b/modules/apache2/templates/project.conf.erb
@@ -1,6 +1,5 @@
 <VirtualHost *>
     ServerAdmin <%= server_admin_email %>
-    ServerAlias <%= domains['staging']%> 
     ServerAlias *.<%= domains['production'] %>
     ServerName <%= domains['production'] %> 
 
@@ -15,7 +14,7 @@
     WSGIProcessGroup <%= client_name %>.<%= project_name %>
     WSGIApplicationGroup %{GLOBAL}
 
-    WSGIScriptAlias / <%= project_path %>current/etc/wsgi/<%= full_project_name %>.wsgi
+    WSGIScriptAlias / <%= project_path %>current/etc/wsgi/production.wsgi
 
     <Directory <%= project_path %>current/etc/wsgi>
         Order deny,allow

diff --git a/modules/deployment/manifests/init.pp b/modules/deployment/manifests/init.pp
@@ -16,31 +16,31 @@
         ensure  => directory,
         owner   => $deploy_user,
         group   => $deploy_group,
-        mode    => 700,
+        mode    => 755,
         require => User[$deploy_user],
     }
 
     file {"/home/$deploy_user/.ssh/authorized_keys":
         ensure => present,
         owner  => $deploy_user,
         group  => $deploy_group,
-        mode   => 640,
+        mode   => 644,
         source => "puppet:///modules/deployment/ssh/authorized_keys",
     }
 
     file {"/home/$deploy_user/.ssh/id_rsa":
         ensure => present,
         owner  => $deploy_user,
         group  => $deploy_group,
-        mode   => 640,
+        mode   => 600,
         source => "puppet:///modules/deployment/ssh/id_rsa",
     }
 
     file {"/home/$deploy_user/.ssh/id_rsa.pub":
         ensure => present,
         owner  => $deploy_user,
         group  => $deploy_group,
-        mode   => 640,
+        mode   => 644,
         source => "puppet:///modules/deployment/ssh/id_rsa.pub",
     }