diff options
| -rw-r--r-- | config/database.yml | 13 | ||||
| -rw-r--r-- | manifest.yaml | 5 |
2 files changed, 15 insertions, 3 deletions
diff --git a/config/database.yml b/config/database.yml index 057b5fe..ed2cdde 100644 --- a/config/database.yml +++ b/config/database.yml @@ -12,7 +12,14 @@ # http://dev.mysql.com/doc/refman/5.0/en/old-client.html development: adapter: mysql - database: mappe - username: mappe - password: <%= ENV['MANMAN_DB_PWD'] %> + database: <%= ENV['MANMAN_DB_NAME'] %> + username: <%= ENV['MANMAN_DB_USER'] %> + password: <%= ENV['MANMAN_DB_PWD'] %> + socket: /var/run/mysqld/mysqld.sock + +production: + adapter: mysql + database: <%= ENV['MANMAN_DB_NAME'] %> + username: <%= ENV['MANMAN_DB_USER'] %> + password: <%= ENV['MANMAN_DB_PWD'] %> socket: /var/run/mysqld/mysqld.sock diff --git a/manifest.yaml b/manifest.yaml index 71441ed..7811438 100644 --- a/manifest.yaml +++ b/manifest.yaml @@ -43,12 +43,17 @@ packages: install: - adduser + - libmysqlclient16 + - libmysql-ruby1.8 - ruby - rubygems plugins: file_copy: + mkdirs: + - dir: /var/run/mysqld + files: - src: . dst: /srv/manman |