salt changes

This commit is contained in:
Matthew Scragg 2014-01-16 16:04:44 -06:00
parent 98c753aba6
commit e18427bfaf
4 changed files with 2 additions and 79 deletions

View file

@ -29,12 +29,10 @@ MODULES = [
] ]
if ENV is 'PROD': if ENV is 'PROD':
#SERVER_NAME = 'realms.io'
PORT = 80 PORT = 80
DOMAIN = 'realms.io' DOMAIN = 'realms.io'
else: else:
DEBUG = True DEBUG = True
ASSETS_DEBUG = True ASSETS_DEBUG = True
#SERVER_NAME = 'realms.dev:8000'
DOMAIN = 'realms.dev' DOMAIN = 'realms.dev'
PORT = 8000 PORT = 8000

View file

@ -1,26 +1,2 @@
DROP TABLE IF EXISTS users; CREATE USER deploy WITH PASSWORD 'dbpassword';
CREATE TABLE users ( GRANT ALL PRIVILEGES ON DATABASE "realms" to deploy;
id SERIAL,
username VARCHAR(100),
password VARCHAR(255),
email VARCHAR(255),
joined TIMESTAMP
);
DROP TABLE IF EXISTS sites;
CREATE TABLE sites (
name VARCHAR(255),
pages INT,
views INT,
created TIMESTAMP
);
DROP TABLE IF EXISTS pages;
CREATE TABLE pages (
id VARCHAR(255), -- <site name>/<path>
edits INT,
views INT,
author INT,
created TIMESTAMP,
modified TIMESTAMP
);

View file

@ -1,41 +0,0 @@
rethinkdb-repo:
pkgrepo.managed:
- name: 'deb http://ppa.launchpad.net/rethinkdb/ppa/ubuntu precise main'
rethinkdb:
pkg.installed:
- require:
- pkgrepo.managed: rethinkdb-repo
rethinkdb-user:
user.present:
- name: rethinkdb
- shell: /bin/bash
- home: /home/rethinkdb
rethinkdb-pip:
pip:
- name: rethinkdb
- installed
- require:
- pkg: python-pip
- pkg: rethinkdb
- pkg: build-essential
/home/rethinkdb/rdb0:
file.directory:
- user: rethinkdb
- group: rethinkdb
- makedirs: True
/etc/rethinkdb/instances.d/rdb0.conf:
file.managed:
- source: salt://rethinkdb/rdb0.conf
rethinkdb-service:
service.running:
- name: rethinkdb
- enable: True
- reload: True
- watch:
- file.managed: /etc/rethinkdb/instances.d/rdb0.conf

View file

@ -1,10 +0,0 @@
runuser=rethinkdb
rungroup=rethinkdb
pid-file=/home/rethinkdb/rdb0/rethinkdb.pid
directory=/home/rethinkdb/rdb0
bind=all
driver-port=28015
cluster-port=29015
port-offset=0
http-port=20000
cores=2