Skip to content

Commit

Permalink
Merge branch 'master' of github.com:zotonic/zotonic
Browse files Browse the repository at this point in the history
  • Loading branch information
Arjan Scherpenisse committed Jan 28, 2012
2 parents 17ac5a6 + bde881c commit 19dadf5
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions zotonic_install
Expand Up @@ -15,9 +15,9 @@ CREATE DATABASE zotonic WITH OWNER = zotonic ENCODING = 'UTF8';
\c zotonic
CREATE LANGUAGE \"plpgsql\";" | su -l postgres -c psql && \
echo "# Zotonic settings
local all zotonic trust
host all zotonic 127.0.0.1/32 trust
host all zotonic ::1/128 trust" >> /etc/postgresql/8.4/main/pg_hba.conf && \
local all zotonic ident
host all zotonic 127.0.0.1/32 md5
host all zotonic ::1/128 md5" >> /etc/postgresql/8.4/main/pg_hba.conf && \
/etc/init.d/postgresql reload && \

mkdir /home/zotonic &&\
Expand Down

0 comments on commit 19dadf5

Please sign in to comment.