Merge Request #5

Merged
softwarepublico/pkg-rpm!5
Created by David Silva

Colab spb theme

Assignee: Macartur Sousa
Milestone: None

Merged by Alexandre Barbosa

Source branch has been removed
Commits (6)
3 participants
colab-spb-theme-plugin/colab-spb-theme-plugin.spec 0 → 100644
... ... @@ -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
... ...
colab/colab.spec
... ... @@ -30,7 +30,7 @@ Integrated software development platform.
30 30 # install colab into virtualenv to make sure dependencies are OK
31 31 rm -rf %{buildvenv}
32 32 cp -r /usr/lib/colab %{buildvenv}
33   -PATH=%{buildvenv}/bin:$PATH pip install --no-index .
  33 +PATH=%{buildvenv}/bin:$PATH pip install --use-wheel --no-index .
34 34 virtualenv --relocatable %{buildvenv}
35 35  
36 36 # cleanup virtualenv
... ... @@ -214,6 +214,10 @@ EOF
214 214 chmod 0640 /etc/colab/settings.py
215 215 fi
216 216  
  217 +install -d -m 0750 -o root -g colab /etc/colab/settings.d
  218 +
  219 +install -d -m 0755 -o colab -g colab /var/lib/colab-assets
  220 +
217 221 # If nginx is available serve assets using it
218 222 if [ -d /usr/share/nginx ]; then
219 223 ln -s /var/lib/colab/assets /usr/share/nginx/colab
... ...
  • 5eb59358fc7b3b7402ae353f8fb36293?s=40&d=identicon
    Macartur Sousa @macartur

    Added 41 new commits:

    • ca077dce - Adding kalibro-configurations-deps rpm
    • f506a82a - Adding sqlite dependencie
    • 257d5769 - Adds spec for kalibro-processor-deps .
    • 759e8400 - Colab 1.10.3
    • 62a7a3f5 - Colab: fix service handling on upgrades
    • f1bb6486 - Adds checkout option for a single package
    • e127258d - Updates kalibro-processor-deps version.
    • 01a292de - Colab: Fix restart sequence.
    • 7b9d6514 - Update release
    • a12d8da2 - Colab: Handle removals on %preun
    • 75e35386 - Increases kalibro-processor-deps version
    • 0537c0fa - Increases prezento-spb-deps version
    • 92cf6b1e - Increases prezento-spb-deps version
    • d2e7b4d9 - Added gunicorn to colab package
    • b91e760e - Fixed colab repo url
    • 44a772d1 - No need to create lock dir since systemd does it
    • 70927e7d - If nginx is available serve assets using it
    • 0f2174ca - Replaced mkdir and chown by install
    • 238891eb - Create log directory
    • 9cfdbf98 - Updated colab settings
    • bcfc09ac - No need for postgresql setup
    • 6db66414 - Adding escape symbol for text content: colab.spec
    • 45ac9e2b - Update spec and apply rpm good practices.
    • f63d9aff - Fix usr/lib directory reference in colab-deps.spec
    • 15488187 - Fix colab-deps description
    • bd54a468 - Update mailman-api to version 0.3c1
    • 3600c073 - Update colab.spec
    • d2854854 - Fix formatter in colab settings
    • 6e002fe0 - Merge branch 'colab-master' of beta.softwarepublico.gov.br:softwarepublico/pkg-rpm into colab-master
    • 0c207069 - Using files attr to set user/group
    • 97990e21 - Replaced "yes yes|" by --noinput on collectstatic
    • c580ca7c - Install celery services
    • fe785685 - Colab assets should run as root
    • f3d2a711 - Fix gunicorn reference in colab.spec
    • 8d829226 - Changing colab/assets permission to colab:colab
    • 3c4aaf5c - Creates settings.d directory in /etc/colab
    • 5255b891 - Creates colab-spb-theme-plugin spec.
    • edafe7d8 - Bumps colab spec version
    • 21b05d98 - Handling colab-spb-theme spec version
    • 446e5724 - Fixing colab-spb-theme's static and templates path
    • 7504130a - Running collectstatic for colab-spb-theme
    Choose File ...   File name...
    Cancel
  • F1c4e7359f83d87a9b8ffc5a003e9cc9?s=40&d=identicon
    Alexandre Barbosa @alexandre
    Choose File ...   File name...
    Cancel