diff --git a/kalibro-configurations/kalibro-configurations.spec b/kalibro-configurations/kalibro-configurations.spec index 31687d5..1afc069 100644 --- a/kalibro-configurations/kalibro-configurations.spec +++ b/kalibro-configurations/kalibro-configurations.spec @@ -29,6 +29,7 @@ cp -r * %{buildroot}/usr/lib/kalibro-configurations rm -rf %{buildroot}/usr/lib/kalibro-configurations/log ln -sfT /var/log/kalibro-configurations %{buildroot}/usr/lib/kalibro-configurations/log ln -sfT /etc/kalibro-configurations/database.yml %{buildroot}/usr/lib/kalibro-configurations/config/database.yml +ln -sfT /etc/kalibro-configurations/secrets.yml %{buildroot}/usr/lib/kalibro-configurations/config/secrets.yml mkdir -p %{buildroot}/lib/systemd/system cat > %{buildroot}/lib/systemd/system/kalibro_configurations.service < %{buildroot}/etc/kalibro-configurations/secrets.yml << EOF +# Do not keep production secrets in the repository, +# instead read values from the environment. +production: + secret_key_base: $(bundle exec rake secret) +EOF #FIXME HACK, REMOVE LATER sed -i -e "s/require.*database_cleaner/# &/" %{buildroot}/usr/lib/kalibro-configurations/app/controllers/tests_controller.rb @@ -66,13 +73,11 @@ fi mkdir -p /var/log/kalibro-configurations chown -R kalibro_configurations:kalibro_configurations /var/log/kalibro-configurations chown -R kalibro_configurations:kalibro_configurations /usr/lib/kalibro-configurations - -if [ -x /usr/bin/postgres ]; then +if [ -x /usr/bin/psql ]; then if [ `systemctl is-active postgresql`!="active" ]; then postgresql-setup initdb || true systemctl start postgresql fi - if [ "$(sudo -u postgres -i psql --quiet --tuples-only -c "select count(*) from pg_user where usename = 'kalibro_configurations';")" -eq 0 ]; then # create user sudo -u postgres -i createuser kalibro_configurations @@ -86,13 +91,7 @@ if [ -x /usr/bin/postgres ]; then cd /usr/lib/kalibro-configurations/ su kalibro_configurations -c "RAILS_ENV=production bundle exec rake db:migrate" if [ $1 -eq 1 ]; then - echo "========================ENTREIEEEIIII" su kalibro_configurations -c "RAILS_ENV=production bundle exec rake db:seed" - cat >> %{buildroot}/etc/profile.d/kalibro_configurations.sh <