Commit a65f9c2b authored by Colin Scott-Fleming's avatar Colin Scott-Fleming
Browse files

Merge branch 'feature/local-database-config' into develop

parents a1c55c4a 31d8508b
{
"folders":
[
{
"path": ".",
"follow_symlinks": true,
"file_exclude_patterns": [],
"folder_exclude_patterns": [
"beemo/app/static/node_modules",
"beemo/app/static/bower_components",
]
}
],
"settings": [
],
"build_systems": [
]
}
......@@ -55,6 +55,22 @@
},
"buffers":
[
{
"file": "beemo/beemo/settings.py",
"settings":
{
"buffer_size": 6426,
"line_ending": "Unix"
}
},
{
"file": "beemo.sublime-project",
"settings":
{
"buffer_size": 73,
"line_ending": "Unix"
}
}
],
"build_system": "",
"command_palette":
......@@ -172,6 +188,21 @@
},
"file_history":
[
"/Users/cix/Code/beemo/beemo.sublime-workspace",
"/Users/cix/Code/beemo/beemo/static/node_modules/grunt-google-cdn/node_modules/bower/node_modules/request/node_modules/form-data/node-form-data.sublime-project",
"/Users/cix/Code/beemo/beemo/static/node_modules/karma/lib/launchers/process.js",
"/Users/cix/Code/beemo/beemo/static/node_modules/grunt-contrib-concat/test/expected/process_function",
"/Users/cix/Code/beemo/beemo/static/node_modules/grunt/node_modules/glob/test/pause-resume.js",
"/Users/cix/Code/beemo/beemo/app/tests/participant_tests.py",
"/Users/cix/Code/beemo/beemo/static/node_modules/grunt/node_modules/colors/ReadMe.md",
"/Users/cix/Code/beemo/beemo/static/node_modules/karma/node_modules/colors/ReadMe.md",
"/Users/cix/Code/beemo/beemo/app/static/node_modules/grunt/node_modules/colors/ReadMe.md",
"/Users/cix/Code/beemo/README.md",
"/Users/cix/Library/Caches/Cleanup At Startup/Transmit/732A0021-85BA-4E7A-BFDB-321326693EF1/postactivate",
"/Users/cix/.virtualenvs/beemo/bin/postactivate",
"/Users/cix/.virtualenvs/beemo/bin/get_env_details",
"/Users/cix/Code/beemo/beemo/static/node_modules/grunt-google-cdn/node_modules/bower/templates/search-empty.mustache",
"/Users/cix/Code/beemo/beemo/api/serializers.py",
"/Users/cix/.teamocil/beemo.yml",
"/Users/cix/.teamocil/swspirits-digital-ocean.yml",
"/Users/cix/.teamocil/swspirits.yml",
......@@ -284,22 +315,7 @@
"/Users/dascottflemingc/Documents/fso/vagrant-titan/projects/barcode-titan/docs/pydocs/Makefile",
"/Users/dascottflemingc/Documents/fso/vagrant-titan/projects/barcode-titan/project/barcode/views.py",
"/Users/dascottflemingc/Documents/fso/vagrant-titan/files/nginx.conf",
"/Users/dascottflemingc/Documents/fso/vagrant-titan/projects/barcode-titan/static/node_modules/grunt-contrib-clean/docs/clean-options.md",
"/Users/dascottflemingc/Documents/fso/vagrant-titan/projects/barcode-titan/docs/pydocs/conf.py",
"/Users/dascottflemingc/Documents/fso/vagrant-titan/projects/barcode-titan/project/barcode/__init__.py",
"/Users/dascottflemingc/Documents/fso/vagrant-titan/projects/barcode-titan/static/node_modules/grunt-contrib-cssmin/node_modules/clean-css/lib/images/url-rebase.js",
"/Users/dascottflemingc/Documents/fso/vagrant-titan/projects/barcode-titan/project/api/tests.py",
"/Users/dascottflemingc/Documents/fso/vagrant-titan/projects/barcode-titan/static/app/styles/bootstrap.css",
"/Users/dascottflemingc/Documents/fso/vagrant-titan/projects/barcode-titan/static/node_modules/grunt-google-cdn/node_modules/bower/node_modules/update-notifier/node_modules/configstore/node_modules/js-yaml/node_modules/argparse/node_modules/underscore.string/test/strings_standalone.js",
"/Users/dascottflemingc/Documents/fso/vagrant-titan/projects/barcode-titan/static/node_modules/grunt-google-cdn/node_modules/bower/node_modules/unzip/node_modules/pullstream/node_modules/slice-stream/.idea/scopes/scope_settings.xml",
"/Users/dascottflemingc/Documents/fso/vagrant-titan/projects/barcode-titan/static/app/bower_components/ng-grid/scripts/server.js",
"/Users/dascottflemingc/Documents/fso/vagrant-titan/projects/barcode-titan/static/node_modules/grunt-contrib-watch/node_modules/tiny-lr/node_modules/faye-websocket/examples/sse.html",
"/Users/dascottflemingc/Documents/fso/vagrant-titan/projects/barcode-titan/docs/jsdocs/docco.css",
"/Users/dascottflemingc/Documents/fso/vagrant-titan/projects/barcode-titan/static/node_modules/karma/node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/test/WebSocketServer.test.js",
"/Users/dascottflemingc/Documents/fso/vagrant-titan/projects/barcode-titan/static/node_modules/grunt-google-cdn/node_modules/bower/node_modules/unzip/node_modules/pullstream/node_modules/slice-stream/.idea/slice-stream.iml",
"/Users/dascottflemingc/Documents/fso/vagrant-titan/projects/barcode-titan/static/node_modules/karma/node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/lib/WebSocketServer.js",
"/Users/dascottflemingc/Documents/fso/vagrant-titan/projects/barcode-titan/static/node_modules/grunt-google-cdn/node_modules/bower/node_modules/unzip/node_modules/match-stream/.idea/scopes/scope_settings.xml",
"/Users/dascottflemingc/Documents/fso/vagrant-titan/projects/barcode-titan/static/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/source-map/build/suffix-source-map.jsm"
"/Users/dascottflemingc/Documents/fso/vagrant-titan/projects/barcode-titan/static/node_modules/grunt-contrib-clean/docs/clean-options.md"
],
"find":
{
......@@ -374,18 +390,166 @@
"whole_word": false,
"wrap": true
},
"folders":
[
{
"follow_symlinks": true,
"path": "/Users/cix/Code/beemo"
}
],
"groups":
[
{
"selected": 1,
"sheets":
[
{
"buffer": 0,
"file": "beemo/beemo/settings.py",
"semi_transient": false,
"settings":
{
"buffer_size": 6426,
"regions":
{
},
"selection":
[
[
1225,
1225
]
],
"settings":
{
"BracketHighlighterBusy": false,
"bh_regions":
[
"bh_square",
"bh_square_center",
"bh_square_open",
"bh_square_close",
"bh_angle",
"bh_angle_center",
"bh_angle_open",
"bh_angle_close",
"bh_single_quote",
"bh_single_quote_center",
"bh_single_quote_open",
"bh_single_quote_close",
"bh_curly",
"bh_curly_center",
"bh_curly_open",
"bh_curly_close",
"bh_regex",
"bh_regex_center",
"bh_regex_open",
"bh_regex_close",
"bh_tag",
"bh_tag_center",
"bh_tag_open",
"bh_tag_close",
"bh_c_define",
"bh_c_define_center",
"bh_c_define_open",
"bh_c_define_close",
"bh_double_quote",
"bh_double_quote_center",
"bh_double_quote_open",
"bh_double_quote_close",
"bh_unmatched",
"bh_unmatched_center",
"bh_unmatched_open",
"bh_unmatched_close",
"bh_default",
"bh_default_center",
"bh_default_open",
"bh_default_close",
"bh_round",
"bh_round_center",
"bh_round_open",
"bh_round_close"
],
"syntax": "Packages/Python/Python.tmLanguage",
"tab_size": 4,
"translate_tabs_to_spaces": true
},
"translation.x": 0.0,
"translation.y": 0.0,
"zoom_level": 1.0
},
"stack_index": 1,
"type": "text"
},
{
"buffer": 1,
"file": "beemo.sublime-project",
"semi_transient": true,
"settings":
{
"buffer_size": 73,
"regions":
{
},
"selection":
[
[
67,
67
]
],
"settings":
{
"BracketHighlighterBusy": false,
"bh_regions":
[
"bh_square",
"bh_square_center",
"bh_square_open",
"bh_square_close",
"bh_angle",
"bh_angle_center",
"bh_angle_open",
"bh_angle_close",
"bh_single_quote",
"bh_single_quote_center",
"bh_single_quote_open",
"bh_single_quote_close",
"bh_curly",
"bh_curly_center",
"bh_curly_open",
"bh_curly_close",
"bh_regex",
"bh_regex_center",
"bh_regex_open",
"bh_regex_close",
"bh_tag",
"bh_tag_center",
"bh_tag_open",
"bh_tag_close",
"bh_c_define",
"bh_c_define_center",
"bh_c_define_open",
"bh_c_define_close",
"bh_double_quote",
"bh_double_quote_center",
"bh_double_quote_open",
"bh_double_quote_close",
"bh_unmatched",
"bh_unmatched_center",
"bh_unmatched_open",
"bh_unmatched_close",
"bh_default",
"bh_default_center",
"bh_default_open",
"bh_default_close",
"bh_round",
"bh_round_center",
"bh_round_open",
"bh_round_close"
],
"syntax": "Packages/JavaScript/JSON.tmLanguage"
},
"translation.x": 0.0,
"translation.y": 0.0,
"zoom_level": 1.0
},
"stack_index": 0,
"type": "text"
}
]
}
],
......@@ -428,7 +592,7 @@
{
"height": 0.0
},
"project": "",
"project": "/Users/cix/Code/swspirits/swspirits.sublime-project",
"replace":
{
"height": 40.0
......@@ -439,6 +603,10 @@
"height": 0.0,
"selected_items":
[
[
"settings.py",
"beemo/beemo/settings.py"
],
[
"admin.py",
"project/barcode/admin.py"
......@@ -705,10 +873,10 @@
"settings":
{
},
"show_minimap": true,
"show_minimap": false,
"show_open_files": true,
"show_tabs": true,
"side_bar_visible": false,
"side_bar_visible": true,
"side_bar_width": 145.0,
"status_bar_visible": true,
"template_settings":
......
......@@ -12,7 +12,8 @@
<!-- Place favicon.ico and apple-touch-icon.png in the root directory -->
<!-- build:css styles/vendor.css -->
<!-- bower:css -->
<link rel="stylesheet" href="{{ STATIC_URL }}bower_components/bootstrap/dist/css/bootstrap.css" />
<link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.css" />
<link rel="stylesheet" href="bower_components/nvd3/src/nv.d3.css" />
<!-- endbower -->
<!-- endbuild -->
<!-- build:css({.tmp,app}) styles/main.css -->
......@@ -52,17 +53,13 @@
<!-- build:js scripts/vendor.js -->
<!-- bower:js -->
<script src="{{ STATIC_URL }}bower_components/jquery/jquery.js"></script>
<script src="{{ STATIC_URL }}bower_components/angular/angular.js"></script>
<script src="{{ STATIC_URL }}bower_components/bootstrap/dist/js/bootstrap.js"></script>
<script src="{{ STATIC_URL }}bower_components/angular-route/angular-route.js"></script>
<!-- nvd3 angular directives -->
<script src="{{ STATIC_URL }}bower_components/d3/d3.js"></script>
<script src="{{ STATIC_URL }}bower_components/nvd3/nv.d3.js"></script>
<script src="{{ STATIC_URL }}bower_components/angularjs-nvd3-directives/dist/angularjs-nvd3-directives.js"></script>
<link rel="stylesheet" href="{{ STATIC_URL }}bower_components/nvd3/nv.d3.css"/>
<script src="bower_components/jquery/jquery.js"></script>
<script src="bower_components/angular/angular.js"></script>
<script src="bower_components/bootstrap/dist/js/bootstrap.js"></script>
<script src="bower_components/angular-route/angular-route.js"></script>
<script src="bower_components/d3/d3.js"></script>
<script src="bower_components/nvd3/nv.d3.js"></script>
<script src="bower_components/angularjs-nvd3-directives/dist/angularjs-nvd3-directives.js"></script>
<!-- endbower -->
<!-- endbuild -->
......
import os
# Twilio API information
TWILIO_INFO = {
'sid': os.environ.get('TWILIO_ACCOUNT_SID', 'TWILIO_ACCOUNT_SID'),
'token': os.environ.get('TWILIO_AUTH_TOKEN', 'TWILIO_AUTH_TOKEN')
'sid': os.environ.get('BEEMO_TWILIO_ACCOUNT_SID', 'BEEMO_TWILIO_ACCOUNT_SID'),
'token': os.environ.get('BEEMO_TWILIO_AUTH_TOKEN', 'BEEMO_TWILIO_AUTH_TOKEN')
}
# Gmail IMAP information
GMAIL_INFO = {
'user': os.environ.get('GMAIL_USERNAME', 'GMAIL_USERNAME'),
'pass': os.environ.get('GMAIL_PASSWORD', 'GMAIL_PASSWORD')
'user': os.environ.get('BEEMO_GMAIL_USERNAME', 'BEEMO_GMAIL_USERNAME'),
'pass': os.environ.get('BEEMO_GMAIL_PASSWORD', 'BEEMO_GMAIL_PASSWORD')
}
# Django settings for beemo project.
DEBUG = True
DEBUG = os.environ.get('BEEMO_DEBUG', 'BEEMO_DEBUG') == 'True'
TEMPLATE_DEBUG = DEBUG
ADMINS = (
......@@ -27,13 +25,12 @@ MANAGERS = ADMINS
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
'NAME': 'db.sqlite', # Or path to database file if using sqlite3.
# The following settings are not used with sqlite3:
'USER': '',
'PASSWORD': '',
'HOST': '', # Empty for localhost through domain sockets or '127.0.0.1' for localhost through TCP.
'PORT': '', # Set to empty string for default.
'ENGINE': os.environ.get('BEEMO_DB_ENGINE', 'BEEMO_DB_ENGINE'),
'NAME': os.environ.get('BEEMO_DB_NAME', 'BEEMO_DB_NAME'),
'USER': os.environ.get('BEEMO_DB_USER', 'BEEMO_DB_USER'),
'PASSWORD': os.environ.get('BEEMO_DB_PASSWORD', 'BEEMO_DB_PASSWORD'),
'HOST': os.environ.get('BEEMO_DB_HOST', '127.0.0.1'),
'PORT': os.environ.get('BEEMO_DB_PORT', ''),
}
}
......
#!/usr/bin/env bash
set -e
oldrev=$1
newrev=$2
run() {
[ -x $1 ] && $1 $oldrev $newrev
}
echo files changed: $(git diff $oldrev $newrev --diff-filter=ACDMR --name-only | wc -l)
umask 002
git submodule sync && git submodule update --init --recursive
run deploy/before_restart
run deploy/restart && run deploy/after_restart
#!/usr/bin/env ruby
oldrev, newrev = ARGV
def run(cmd)
exit($?.exitstatus) unless system "umask 002 && #{cmd}"
end
RAILS_ENV = ENV['RAILS_ENV'] || 'production'
use_bundler = File.file? 'Gemfile'
rake_cmd = use_bundler ? 'bundle exec rake' : 'rake'
if use_bundler
bundler_args = ['--deployment']
BUNDLE_WITHOUT = ENV['BUNDLE_WITHOUT'] || 'development:test'
bundler_args << '--without' << BUNDLE_WITHOUT unless BUNDLE_WITHOUT.empty?
# update gem bundle
run "bundle install #{bundler_args.join(' ')}"
end
if File.file? 'Rakefile'
tasks = []
num_migrations = `git diff #{oldrev} #{newrev} --diff-filter=A --name-only -z db/migrate`.split("\0").size
# run migrations if new ones have been added
tasks << "db:migrate" if num_migrations > 0
# precompile assets
changed_assets = `git diff #{oldrev} #{newrev} --name-only -z app/assets`.split("\0")
tasks << "assets:precompile" if changed_assets.size > 0
run "#{rake_cmd} #{tasks.join(' ')} RAILS_ENV=#{RAILS_ENV}" if tasks.any?
end
# clear cached assets (unversioned/ignored files)
run "git clean -x -f -- public/stylesheets public/javascripts"
# clean unversioned files from vendor/plugins (e.g. old submodules)
run "git clean -d -f -- vendor/plugins"
#!/bin/sh
touch tmp/restart.txt
echo "restarting Passenger app"
......@@ -5,7 +5,7 @@ from sqlalchemy.ext.declarative import declarative_base
from app.models import Email, Phone, Participant, Call, ParticipantProblem
locale.setlocale(locale.LC_ALL, 'en_us')
locale.setlocale(locale.LC_ALL, 'en_US.UTF-8')
# SQLAlchemy declarative base boilerplate
engine = create_engine('mysql://liveslocal:[email protected]/liveslocal')
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment