Permalink
Browse files

Merge branch 'develop' of https://github.com/localprojects/Change-By-Us

… into feature/calendar
  • Loading branch information...
2 parents 7bd06ad + bc8cf21 commit f3e76e2eec29d84a94eeacfb71d76643a6855daa Ethan Holda committed May 1, 2012
Showing with 19 additions and 4 deletions.
  1. +10 −0 .gitignore
  2. +1 −0 etc/config.yaml.tmpl
  3. +1 −0 etc/logrotate.d/lp-changebyus.tmpl
  4. +3 −3 etc/supervisor/supervisor.conf.tmpl
  5. +1 −1 fabfile.py
  6. +2 −0 rcfile.sample
  7. +1 −0 requirements.live
View
@@ -48,6 +48,8 @@ config.yaml*
!config.yaml.sample
rcfile.*
!rcfile.sample
+supervisor.conf
+supervisord.conf
#-----
# Ignore log files
@@ -122,3 +124,11 @@ run/*
*.crt
*.id_rsa
*.id_dsa
+
+#-----
+# Ignore all etc configurations, but keep templates and readme's
+#-----
+etc/*
+!etc/*.tmpl
+!etc/*README*
+!etc/*.sample
View
@@ -41,6 +41,7 @@ instance: %(instance)s
htaccess: %(htaccess)s
logfile: %(logfile)s
log_archive_path: %(log_archive_path)s
+loglevel: %(log_level)s
# Locations
#--------------------------------------------------------------------
@@ -23,6 +23,7 @@
/etc/init.d/lighttpd reload %(app_path)s > /dev/null 2>&1; \
fi; \
fi;
+ [ -f %(run_path)s/uwsgi.sock ] && sudo supervisorctl restart %(application)s
endscript
}
@@ -1,7 +1,7 @@
[program:%(application)s]
command=/usr/local/bin/uwsgi
--socket %(app_path)s/run/uwsgi.sock
- --logto %(app_path)s/var/log/uwsgi.log
+ --logto %(log_path)s/uwsgi.log
--pythonpath %(app_path)s/current
--wsgi-file %(app_path)s/current/wsgi.py
--callable application
@@ -10,7 +10,7 @@ command=/usr/local/bin/uwsgi
--processes 4
--chmod
directory=%(app_path)s/current
-user=giveaminute
+user=%(user)s
autostart=true
autorestart=true
-stopsignal=QUIT
+stopsignal=QUIT
View
@@ -208,7 +208,7 @@ def wrapper():
# Configuration Template Files and config files
env.etc_path = '%(app_path)s/etc' % env
- env.log_path = '%(app_path)s/var/log' % env
+ env.log_path = env.log_path or '%(app_path)s/var/log' % env
env.local_etc_path = '%(build_path)s/etc' % env
# Todo: these might need to be moved to a common location
View
@@ -41,6 +41,8 @@ branch = develop
logfile = %(log_path)s/%(application)s.log
# Path to store old log files (post-rotate, by logrotate.d)
log_archive_path = /mnt/var/log/
+# Log level is lowercase - debug, info, warning, error, etc.
+log_level = debug
#------------------------------------------------
# LOCAL (user-specific) Parameters
View
@@ -19,6 +19,7 @@ PIL
oauth2
python-dateutil
flup
+jinja2
# Database orm
SQLAlchemy

0 comments on commit f3e76e2

Please sign in to comment.