From 3aae2cc7f7166765de7bb003b332ed45157d4e8a Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Tue, 17 Jun 2014 16:44:39 +0100 Subject: https URLs for github --- docs/installing/macos.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/installing/macos.md') diff --git a/docs/installing/macos.md b/docs/installing/macos.md index 2b6309b89..c46bdf4ba 100644 --- a/docs/installing/macos.md +++ b/docs/installing/macos.md @@ -25,7 +25,7 @@ If you are using OS X Lion, download *Command Line Tools for Xcode* from [Apple] **Note:** As of Xcode 4.2, a non-LLVM version of GCC is no longer included. Homebrew has dealt with it by [switching to Clang](https://github.com/mxcl/homebrew/issues/6852). However, you may encounter errors installing RVM. *Please report these on the [mailing list](https://groups.google.com/group/alaveteli-dev).* The following instructions have been tested with Xcode 4.1. If necessary, you can install GCC from Xcode 4.1 by running: - brew install http://github.com/adamv/homebrew-alt/raw/master/duplicates/apple-gcc42.rb + brew install https://github.com/adamv/homebrew-alt/raw/master/duplicates/apple-gcc42.rb ## Homebrew -- cgit v1.2.3 From d0a8e9b3eb82176faec6896af3eb0333e794962f Mon Sep 17 00:00:00 2001 From: Gareth Rees Date: Fri, 6 Jun 2014 16:58:44 +0100 Subject: Use template for setting up postgres databases Seems to be the cleanest way for ensuring databases are always created with UTF-8 encoding, if for example the admin has not configured the system locale. --- docs/installing/macos.md | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) (limited to 'docs/installing/macos.md') diff --git a/docs/installing/macos.md b/docs/installing/macos.md index c46bdf4ba..bdb4c90d8 100644 --- a/docs/installing/macos.md +++ b/docs/installing/macos.md @@ -88,17 +88,27 @@ The following is mostly from [the manual installation process]({{ site.baseurl}} ### Configure database -Creates Alaveteli databases and an `foi` user with password `foi`. - - echo "CREATE DATABASE foi_development encoding = 'UTF8'; - CREATE DATABASE foi_test encoding = 'UTF8'; - CREATE USER foi WITH CREATEUSER; - ALTER USER foi WITH PASSWORD 'foi'; - ALTER USER foi WITH CREATEDB; - GRANT ALL PRIVILEGES ON DATABASE foi_development TO foi; - GRANT ALL PRIVILEGES ON DATABASE foi_test TO foi; - ALTER DATABASE foi_development OWNER TO foi; - ALTER DATABASE foi_test OWNER TO foi;" | psql -h localhost template1 +Create a database for your Mac user as homebrew doesn't create one by default: + + createdb + +Create a `foi` user from the command line, like this: + + createuser -s -P foi + +_Note:_ Leaving the password blank will cause great confusion if you're new to +PostgreSQL. + +We'll create a template for our Alaveteli databases: + + createdb -T template0 -E UTF-8 template_utf8 + echo "update pg_database set datistemplate=true where datname='template_utf8';" | psql + +Then create the databases: + + createdb -T template_utf8 -O foi foi_production + createdb -T template_utf8 -O foi foi_test + createdb -T template_utf8 -O foi foi_development ### Clone Alaveteli -- cgit v1.2.3 From 3cd30c9952f9d174ff4b774b43659900f1d444d8 Mon Sep 17 00:00:00 2001 From: Gareth Rees Date: Wed, 25 Jun 2014 11:43:00 +0100 Subject: Use alaveteli_ as database prefix rather than foi_ Clearer what app the database belongs to --- docs/installing/macos.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docs/installing/macos.md') diff --git a/docs/installing/macos.md b/docs/installing/macos.md index bdb4c90d8..e93ea452f 100644 --- a/docs/installing/macos.md +++ b/docs/installing/macos.md @@ -106,9 +106,9 @@ We'll create a template for our Alaveteli databases: Then create the databases: - createdb -T template_utf8 -O foi foi_production - createdb -T template_utf8 -O foi foi_test - createdb -T template_utf8 -O foi foi_development + createdb -T template_utf8 -O foi alaveteli_production + createdb -T template_utf8 -O foi alaveteli_test + createdb -T template_utf8 -O foi alaveteli_development ### Clone Alaveteli -- cgit v1.2.3