diff --git a/colab.spec b/colab.spec index e5fdeb3..3bfcf5a 100644 --- a/colab.spec +++ b/colab.spec @@ -1,7 +1,7 @@ %define name colab -%define version 2.0a2 -%define unmangled_version 2.0a2 -%define release 2 +%define version 2.0a3 +%define unmangled_version 2.0a3 +%define release 3 %define buildvenv /var/tmp/%{name}-%{version} Summary: Collaboration platform for communities @@ -91,41 +91,23 @@ fi usermod --append --groups mailman colab -# 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 - - mkdir -p /etc/colab +mkdir -p /etc/colab - if [ ! -f /etc/colab/settings.yaml ]; then - SECRET_KEY=$(openssl rand -hex 32) - cat > /etc/colab/settings.yaml < /etc/colab/settings.yaml < /etc/colab/settings.d/00-database.yaml < /etc/colab/settings.d/00-database.yaml <