Merge branch 'colab-master'

Rodrigo Siqueira de Melo
2 parents 209378d3 e0edd6a5
Showing 4 changed files with 184 additions and 103 deletions Show diff stats
colab-deps/colab-deps.spec
colab-spb-theme-plugin/colab-spb-theme-plugin.spec
colab/colab.spec
mailman-api/mailman-api.spec
 %define name colab-deps
-%define version 1.10
+%define version 1.11
 %define release 1
-Summary: Collaboration platform for communities (Pyton dependencies)
+Summary: Collaboration platform for communities (Python dependencies)
 Name: %{name}
 Version: %{version}
 Release: %{release}
@@ -19,12 +19,14 @@ BuildRequires: gettext, libxml2-devel, libxslt-devel, openssl-devel, libffi-deve
 Integrated software development platform (Python dependencies).
 %prep
-%setup -n %{name}-%{version} -n %{name}-%{version}
+%setup -q
 %build
+cd %{_builddir}
 make
 %install
+cd %{_builddir}
 %make_install
 %clean
@@ -0,0 +1,37 @@
+Name:    colab-spb-theme
+Version: 0.2.0
+Release: 1
+Summary: SPB-specific Colab theme
+Group:   Applications/Publishing
+License: GPLv3
+URL:     https://portal.softwarepublico.gov.br/gitlab/softwarepublico/colab-spb-theme-plugin
+Source0: %{name}-%{version}.tar.gz
+BuildArch: noarch
+BuildRequires: colab >= 1.11
+Requires: colab >= 1.11
+%description
+This package contains Colab theme for Software Público Brasileiro platform.
+
+%prep
+%setup -q
+
+%build
+make
+
+%install
+
+install -d  %{buildroot}/etc/colab/settings.d/
+
+cat > %{buildroot}/etc/colab/settings.d/spb_theme.py << EOF
+COLAB_STATICS=['/usr/lib/colab/colab-spb-theme/colab_spb_theme/static']
+COLAB_TEMPLATES=('/usr/lib/colab/colab-spb-theme/colab_spb_theme/templates',)
+EOF
+
+make install DESTDIR=%{buildroot}
+
+%post
+yes yes | colab-admin collectstatic
+
+%files
+/usr/lib/colab
+/etc/colab
 %define name colab
-%define version 1.10.3
-%define default_release 4
+%define version 1.11.0
+%define default_release 1
 %{!?release: %define release %{default_release}}
 %define buildvenv /var/tmp/%{name}-%{version}
@@ -14,10 +14,11 @@ Group: Development/Tools
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Prefix: %{_prefix}
 Vendor: Sergio Oliveira <sergio@tracy.com.br>
-Url: https://github.com/colab-community/colab
+Url: https://github.com/colab/colab
 BuildArch: noarch
-BuildRequires: colab-deps >= 1.10, python-virtualenv
-Requires: colab-deps >= 1.10, solr, mailman-api
+BuildRequires: colab-deps >= 1.11, python-virtualenv
+# TODO: Set mailman-api version (0.3c1)
+Requires: colab-deps >= 1.11, solr, mailman-api
 %description
 Integrated software development platform.
@@ -29,7 +30,7 @@ Integrated software development platform.
 # install colab into virtualenv to make sure dependencies are OK
 rm -rf %{buildvenv}
 cp -r /usr/lib/colab %{buildvenv}
-PATH=%{buildvenv}/bin:$PATH pip install --no-index .
+PATH=%{buildvenv}/bin:$PATH pip install --use-wheel --no-index  .
 virtualenv --relocatable %{buildvenv}
 # cleanup virtualenv
@@ -43,13 +44,30 @@ rm -f cleanup.list
 find %{buildvenv} -type d -empty -delete
 %install
-mkdir -p %{buildroot}/etc/colab
-mkdir -p %{buildroot}/usr/lib
+
+# install config file
+install -d -m 0755 %{buildroot}/etc/colab
+install -m 0644 misc/etc/colab/gunicorn.py %{buildroot}/etc/colab/gunicorn.py.example
+
+# Create settings dirs
+install -d -m 0755 %{buildroot}/etc/colab/settings.d
+install -d -m 0755 %{buildroot}/etc/colab/plugins.d
+
+# create log dir
+install -d -m 0755 %{buildroot}/var/log/colab
+
+# create celery dir
+install -d -m 0755 %{buildroot}/var/lib/colab/celery
+
+# Create assets dir (stores static files)
+install -d -m 0755 %{buildroot}/var/lib/colab/assets
 # install virtualenv
+install -d -m 0755 %{buildroot}/usr/lib
 rm -rf %{buildroot}/usr/lib/colab
 cp -r %{buildvenv} %{buildroot}/usr/lib/colab
 mkdir -p %{buildroot}/%{_bindir}
+
 cat > %{buildroot}/%{_bindir}/colab-admin <<EOF
 #!/bin/sh
 set -e
@@ -65,6 +83,8 @@ chmod +x %{buildroot}/%{_bindir}/colab-admin
 # install initscript
 install -d -m 0755 %{buildroot}/lib/systemd/system
 install -m 0644 misc/lib/systemd/system/colab.service %{buildroot}/lib/systemd/system
+install -m 0644 misc/lib/systemd/system/celeryd.service %{buildroot}/lib/systemd/system
+install -m 0644 misc/lib/systemd/system/celerybeat.service %{buildroot}/lib/systemd/system
 # install crontab
 install -d -m 0755 %{buildroot}/etc/cron.d
 install -m 0644 misc/etc/cron.d/colab %{buildroot}/etc/cron.d
@@ -74,10 +94,22 @@ rm -rf $RPM_BUILD_ROOT
 rm -rf %{buildvenv}
 %files
+%defattr(-, root, root)
+
 /usr/lib/colab
+#/var/lib/colab # XXX: remove if doesnt break
+/var/lib/colab/assets
+%attr(-, colab, colab) /var/lib/colab/celery
+%attr(-, colab, colab) /var/log/colab
 %{_bindir}/*
 /etc/cron.d/colab
+#/etc/colab # XXX: remove if doesnt break
+/etc/colab/settings.d
+/etc/colab/plugins.d
+/etc/colab/gunicorn.py.example
 /lib/systemd/system/colab.service
+/lib/systemd/system/celeryd.service
+/lib/systemd/system/celerybeat.service
 %post
 groupadd colab || true
@@ -85,112 +117,122 @@ if ! id colab; then
   useradd --system --gid colab  --home-dir /usr/lib/colab --no-create-home colab
 fi
-mkdir -p /etc/colab
+mv /etc/colab/gunicorn.py.example /etc/colab/gunicorn.py
-if [ ! -f /etc/colab/settings.yaml ]; then
+if [ ! -f /etc/colab/settings.py ]; then
   SECRET_KEY=$(openssl rand -hex 32)
-  cat > /etc/colab/settings.yaml <<EOF
-## Set to false in production
-DEBUG: true
-TEMPLATE_DEBUG: true
-
-## System admins
-ADMINS: &admin
-  -
-    - John Foo
-    - john@example.com
-  -
-    - Mary Bar
-    - mary@example.com
-
-MANAGERS: *admin
-
-COLAB_FROM_ADDRESS: '"Colab" <noreply@example.com>'
-SERVER_EMAIL: '"Colab" <noreply@example.com>'
-
-EMAIL_HOST: localhost
-EMAIL_PORT: 25
-EMAIL_SUBJECT_PREFIX: '[colab]'
-
-SECRET_KEY: '$SECRET_KEY'
-
-SITE_URL: 'http://localhost:8001/'
-BROWSERID_AUDIENCES:
-  - http://localhost:8001
-#  - http://example.com
-#  - https://example.org
-#  - http://example.net
-
-ALLOWED_HOSTS:
-  - localhost
-#  - example.com
-#  - example.org
-#  - example.net
-
-## Disable indexing
-ROBOTS_NOINDEX: false
-
-## Disable browser id authentication
-#  BROWSERID_ENABLED: true
-EOF
-  chown root:colab /etc/colab/settings.yaml
-  chmod 0640 /etc/colab/settings.yaml
-fi
+  cat > /etc/colab/settings.py <<EOF
+
+# Set to false in production
+DEBUG = True
+TEMPLATE_DEBUG = True
+
+# System admins
+ADMINS = [['John Foo', 'john@example.com'], ['Mary Bar', 'mary@example.com']]
+
+MANAGERS = ADMINS
+
+COLAB_FROM_ADDRESS = '"Colab" <noreply@example.com>'
+SERVER_EMAIL = '"Colab" <noreply@example.com>'
+
+EMAIL_HOST = 'localhost'
+EMAIL_PORT = 25
+EMAIL_SUBJECT_PREFIX = '[colab]'
+
+SECRET_KEY = '$(openssl rand -hex 32)'
+
+ALLOWED_HOSTS = [
+    'localhost',
+#    'example.com',
+#    'example.org',
+#    'example.net',
+]
+
+# Database settings
+#
+#     When DEBUG is True colab will create the DB on
+#     the repository root. In case of production settings
+#     (DEBUG False) the DB settings must be set.
+#
+# DATABASES = {
+#     'default': {
+#         'ENGINE': 'django.db.backends.sqlite3',
+#         'NAME': '/path/to/colab.sqlite3',
+#     }
+# }
+
+# Disable indexing
+ROBOTS_NOINDEX = False
+
+LOGGING = {
+    'version': 1,
+    'disable_existing_loggers': True,
+
+    'formatters': {
+        'colab': { 'format' : '[colab] (%%(name)s) %%(levelname)s: %%(message)s'},
+        'verbose': { 'format' : '%%(asctime)s (%%(name)s) %%(levelname)s: %%(message)s'},
+    },
+
+    'handlers': {
+        'null': {
+            'level': 'DEBUG',
+            'class': 'logging.NullHandler',
+        },
+        'syslog': {
+            'level': 'WARNING',
+            'class': 'logging.handlers.SysLogHandler',
+            'formatter': 'colab',
+            'address': '/dev/log',
+        },
+        'file': {
+            'level': 'DEBUG',
+            'class': 'logging.handlers.TimedRotatingFileHandler',
+            'filename': '/var/log/colab/colab.log',
+            'interval': 24,  # 24 hours
+            'backupCount': 7,  # keep last 7 backups
+            'encoding': 'UTF-8',
+            'formatter': 'verbose',
+        },
+    },
+
+    'loggers': {
+        'django': {
+            'handlers': ['file', 'syslog'],
+            'propagate': False,
+        },
+        'revproxy': {
+            'handlers': ['file', 'syslog'],
+            'propagate': False,
+            'level': 'ERROR',
+        },
+    },
+}
-mkdir -p /etc/colab/settings.d
-
-if [ ! -f /etc/colab/settings.d/00-database.yaml ]; then
-  cat > /etc/colab/settings.d/00-database.yaml <<EOF
-DATABASES:
-  default:
-    ENGINE: django.db.backends.postgresql_psycopg2
-    NAME: colab
-    USER: colab
-    HOST: localhost
-    PORT: 5432
 EOF
-  chown root:colab /etc/colab/settings.d/00-database.yaml
-  chmod 0640 /etc/colab/settings.d/00-database.yaml
-fi
-# 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
-
-  colab-admin migrate
+  chown root:colab /etc/colab/settings.py
+  chmod 0640 /etc/colab/settings.py
 fi
-mkdir -p /var/lock/colab
-chown colab:colab /var/lock/colab
-
-mkdir -p /var/lib/colab-assets
-chown colab:colab /var/lib/colab-assets
+install -d -m 0750 -o root -g colab /etc/colab/settings.d
-mkdir -p /usr/share/nginx/
+install -d -m 0755 -o colab -g colab /var/lib/colab-assets
-ln -s /var/lib/colab-assets /usr/share/nginx/colab
+# If nginx is available serve assets using it
+if [ -d /usr/share/nginx ]; then
+    ln -s /var/lib/colab/assets /usr/share/nginx/colab
+fi
-yes yes | colab-admin collectstatic
+chown -R colab:colab /var/lib/colab/assets
+colab-admin collectstatic --noinput
 if [ $1 -gt 1 ]; then
   # upgrade; restart if running
   systemctl try-restart colab
 fi
+systemctl daemon-reload
+
 %preun
 if [ $1 -eq 0 ]; then
   # package being removed
 %define name mailman-api
-%define version 0.2.10
-%define unmangled_version 0.2.10
+%define version 0.3c1
+%define unmangled_version 0.3c1
 %define release 1
 Summary: REST API daemon to interact with Mailman 2
@@ -0,0 +1,37 @@		@@ -0,0 +1,37 @@
	1	+Name: colab-spb-theme
	2	+Version: 0.2.0
	3	+Release: 1
	4	+Summary: SPB-specific Colab theme
	5	+Group: Applications/Publishing
	6	+License: GPLv3
	7	+URL: https://portal.softwarepublico.gov.br/gitlab/softwarepublico/colab-spb-theme-plugin
	8	+Source0: %{name}-%{version}.tar.gz
	9	+BuildArch: noarch
	10	+BuildRequires: colab >= 1.11
	11	+Requires: colab >= 1.11
	12	+%description
	13	+This package contains Colab theme for Software Público Brasileiro platform.
	14	+
	15	+%prep
	16	+%setup -q
	17	+
	18	+%build
	19	+make
	20	+
	21	+%install
	22	+
	23	+install -d %{buildroot}/etc/colab/settings.d/
	24	+
	25	+cat > %{buildroot}/etc/colab/settings.d/spb_theme.py << EOF
	26	+COLAB_STATICS=['/usr/lib/colab/colab-spb-theme/colab_spb_theme/static']
	27	+COLAB_TEMPLATES=('/usr/lib/colab/colab-spb-theme/colab_spb_theme/templates',)
	28	+EOF
	29	+
	30	+make install DESTDIR=%{buildroot}
	31	+
	32	+%post
	33	+yes yes \| colab-admin collectstatic
	34	+
	35	+%files
	36	+/usr/lib/colab
	37	+/etc/colab
1	%define name mailman-api	1	%define name mailman-api
2	-%define version 0.2.10
3	-%define unmangled_version 0.2.10	2	+%define version 0.3c1
		3	+%define unmangled_version 0.3c1
4	%define release 1	4	%define release 1
5		5
6	Summary: REST API daemon to interact with Mailman 2	6	Summary: REST API daemon to interact with Mailman 2