diff --git a/.gitignore b/.gitignore index 7a58ce6..7409a54 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,6 @@ coverage_report/ # Whoosh Index tests/whoosh_index/ + +# Open Build System +.obs/ diff --git a/colab.spec b/colab.spec index 3bfcf5a..48284a1 100644 --- a/colab.spec +++ b/colab.spec @@ -1,7 +1,6 @@ %define name colab -%define version 2.0a3 -%define unmangled_version 2.0a3 -%define release 3 +%define version 1.9 +%define unmangled_version 1.9 %define buildvenv /var/tmp/%{name}-%{version} Summary: Collaboration platform for communities @@ -46,9 +45,6 @@ find %{buildvenv} -type d -empty -delete mkdir -p %{buildroot}/etc/colab mkdir -p %{buildroot}/usr/lib -mkdir -p %{buildroot}/usr/share/nginx/ -ln -s /var/lib/colab-assets %{buildroot}/usr/share/nginx/colab - # install virtualenv rm -rf %{buildroot}/usr/lib/colab cp -r %{buildvenv} %{buildroot}/usr/lib/colab @@ -81,7 +77,6 @@ rm -rf %{buildvenv} %{_bindir}/* /etc/cron.d/colab /lib/systemd/system/colab.service -/usr/share/nginx/colab %post groupadd colab || true @@ -89,8 +84,6 @@ if ! id colab; then useradd --system --gid colab --home-dir /usr/lib/colab --no-create-home colab fi -usermod --append --groups mailman colab - mkdir -p /etc/colab if [ ! -f /etc/colab/settings.yaml ]; then @@ -102,12 +95,12 @@ TEMPLATE_DEBUG: true ## System admins ADMINS: &admin -- - - John Foo - - john@example.com -- - - Mary Bar - - mary@example.com + - + - John Foo + - john@example.com + - + - Mary Bar + - mary@example.com MANAGERS: *admin @@ -120,15 +113,15 @@ EMAIL_SUBJECT_PREFIX: '[colab]' SECRET_KEY: '$SECRET_KEY' -SITE_URL: 'http://localhost:8000' +SITE_URL: 'http://localhost:8001/' BROWSERID_AUDIENCES: -- http://localhost:8000 + - http://localhost:8001 # - http://example.com # - https://example.org # - http://example.net ALLOWED_HOSTS: -- localhost + - localhost # - example.com # - example.org # - example.net @@ -136,12 +129,8 @@ ALLOWED_HOSTS: ## Disable indexing ROBOTS_NOINDEX: false -#PROXIED_APPS: -# gitlab: -# upstream: 'http://localhost:8080/gitlab/' - -## Enabled BROWSER_ID protocol -# BROWSERID_ENABLED: True +## Disable browser id authentication +# BROWSERID_ENABLED: true EOF chown root:colab /etc/colab/settings.yaml chmod 0640 /etc/colab/settings.yaml @@ -152,18 +141,17 @@ mkdir -p /etc/colab/settings.d if [ ! -f /etc/colab/settings.d/00-database.yaml ]; then cat > /etc/colab/settings.d/00-database.yaml <