From 94c85deb4e54c14d16aa9bca58521f9023898ba8 Mon Sep 17 00:00:00 2001 From: Sergio Oliveira Date: Thu, 27 Aug 2015 22:39:22 -0300 Subject: [PATCH] No need for postgresql setup --- colab/colab.spec | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/colab/colab.spec b/colab/colab.spec index 6fc4445..4b2360e 100644 --- a/colab/colab.spec +++ b/colab/colab.spec @@ -191,28 +191,8 @@ fi mkdir -p /etc/colab/settings.d -# only applies if there is a local PostgreSQL server -if [ -x /usr/bin/postgres ]; then - - # start/enable the service - postgresql-setup initdb || true - systemctl start postgresql - systemctl enable postgresql - - if [ "$(sudo -u postgres -i psql --quiet --tuples-only -c "select count(*) from pg_user where usename = 'colab';")" -eq 0 ]; then - # create user - sudo -u postgres -i createuser colab - fi - - if [ "$(sudo -u postgres -i psql --quiet --tuples-only -c "select count(1) from pg_database where datname = 'colab';")" -eq 0 ]; then - # create database - sudo -u postgres -i createdb --owner=colab colab - fi ->>>>>>> Updated colab settings - - chown root:colab /etc/colab/settings.py - chmod 0640 /etc/colab/settings.py -fi +chown root:colab /etc/colab/settings.py +chmod 0640 /etc/colab/settings.py install -d -m 0755 -o colab -g colab /var/lib/colab-assets -- libgit2 0.21.2