Personal/realms-wiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

repo config changes

Browse source
This commit is contained in:
Matthew Scragg 2013-10-03 10:35:47 -05:00
parent 2bbeb52178
commit 8eb1b4e471
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
realms/__init__.py
View file

@ -14,7 +14,7 @@ from werkzeug.routing import BaseConverter
import config import config
from session import RedisSessionInterface from session import RedisSessionInterface
from wiki import Wiki from wiki import Wiki
from util import to_canonical, remove_ext from util import to_canonical, remove_ext, mkdir_safe
class RegexConverter(BaseConverter): class RegexConverter(BaseConverter):
@ -50,7 +50,8 @@ if not config.db['dbname'] in rdb.db_list().run(conn) and config.ENV is not 'PRO
for tbl in ['sites', 'users', 'pages']: for tbl in ['sites', 'users', 'pages']:
rdb.table_create(tbl).run(conn) rdb.table_create(tbl).run(conn)
repo_dir = config.repo['dir'] main_repo_dir = config.repos['main']
repo_dir = config.repos['dir']
# This is down here because of dependencies above # This is down here because of dependencies above
from models import Site, User, CurrentUser from models import Site, User, CurrentUser
@ -60,7 +61,7 @@ from models import Site, User, CurrentUser
def load_user(user_id): def load_user(user_id):
return CurrentUser(user_id) return CurrentUser(user_id)
w = Wiki(repo_dir) w = Wiki(main_repo_dir)
def redirect_url(): def redirect_url():

4
srv/salt/realms/init.sls
View file

@ -5,11 +5,13 @@ python-pkgs:
- python-pip - python-pip
- build-essential - build-essential
{% for pkg in ['tornado', 'pyzmq', 'itsdangerous', 'boto', 'redis', 'simplejson', 'sockjs-tornado', 'flask', 'flask-bcrypt', 'flask-login', 'flask-assets', 'gittle', 'gevent', 'lxml', 'markdown2', 'recaptcha-client', 'RethinkORM' ] %}
{% for pkg in ['tornado', 'pyzmq', 'itsdangerous', 'boto', 'redis', 'simplejson', 'sockjs-tornado', 'flask', 'flask-bcrypt', 'flask-login', 'flask-assets', 'gittle', 'gevent', 'lxml', 'markdown2', 'recaptcha-client', 'rethinkdb', 'RethinkORM' ] %}
{{ pkg }}-pip: {{ pkg }}-pip:
pip: pip:
- name: {{ pkg }} - name: {{ pkg }}
- installed - installed
- require: - require:
- pkg.installed: common-pkgs - pkg.installed: common-pkgs
- pkg.installed: rethinkdb
{% endfor %} {% endfor %}