Download as
Browse Code »

Commit 0c207069b85dd3edd65c398a129dbde27da4cef5

Authored by Sergio Oliveira
1 parent 6e002fe0
Exists in colab-master

Using files attr to set user/group 

Signed-off-by: Matheus Fernandes <msfernandes@gmail.com>
Signed-off-by: Sergio Oliveira <sergio@tracy.com.br>
Signed-off-by: Rodrigo Siqueira <rodrigosiqueiramelo@gmail.com>
Showing 1 changed file with 22 additions and 9 deletions   Show diff stats
colab/colab.spec
  Diff comments   View file @0c20706
@@ -49,8 +49,18 @@ find %{buildvenv} -type d -empty -delete @@ -49,8 +49,18 @@ find %{buildvenv} -type d -empty -delete
49 install -d -m 0755 %{buildroot}/etc/colab 49 install -d -m 0755 %{buildroot}/etc/colab
50 install -m 0644 misc/etc/colab/gunicorn.py %{buildroot}/etc/colab 50 install -m 0644 misc/etc/colab/gunicorn.py %{buildroot}/etc/colab
51 51
52 -# install log  
53 -install -d -m 0755 -o colab -g colab %{buildroot}/var/log/colab 52 +# Create settings dirs
  53 +install -d -m 0755 %{buildroot}/etc/colab/settings.d
  54 +install -d -m 0755 %{buildroot}/etc/colab/plugins.d
  55 +
  56 +# create log dir
  57 +install -d -m 0755 %{buildroot}/var/log/colab
  58 +
  59 +# create celery dir
  60 +install -d -m 0755 %{buildroot}/var/lib/colab/celery
  61 +
  62 +# Create assets dir (stores static files)
  63 +install -d -m 0755 %{buildroot}/var/lib/colab/assets
54 64
55 # install virtualenv 65 # install virtualenv
56 install -d -m 0755 %{buildroot}/usr/lib 66 install -d -m 0755 %{buildroot}/usr/lib
@@ -82,11 +92,18 @@ rm -rf $RPM_BUILD_ROOT @@ -82,11 +92,18 @@ rm -rf $RPM_BUILD_ROOT
82 rm -rf %{buildvenv} 92 rm -rf %{buildvenv}
83 93
84 %files 94 %files
  95 +%defattr(-, root, root)
  96 +
85 /usr/lib/colab 97 /usr/lib/colab
86 -/var/log/colab 98 +#/var/lib/colab # XXX: remove if doesnt break
  99 +%attr(-, colab, colab) /var/lib/colab/assets
  100 +%attr(-, colab, colab) /var/lib/colab/celery
  101 +%attr(-, colab, colab) /var/log/colab
87 %{_bindir}/* 102 %{_bindir}/*
88 /etc/cron.d/colab 103 /etc/cron.d/colab
89 -/etc/colab 104 +#/etc/colab # XXX: remove if doesnt break
  105 +/etc/colab/settings.d
  106 +/etc/colab/plugins.d
90 /etc/colab/gunicorn.py 107 /etc/colab/gunicorn.py
91 /lib/systemd/system/colab.service 108 /lib/systemd/system/colab.service
92 109
@@ -191,13 +208,9 @@ EOF @@ -191,13 +208,9 @@ EOF
191 chmod 0640 /etc/colab/settings.py 208 chmod 0640 /etc/colab/settings.py
192 fi 209 fi
193 210
194 -mkdir -p /etc/colab/settings.d  
195 -  
196 -install -d -m 0755 -o colab -g colab /var/lib/colab-assets  
197 -  
198 # If nginx is available serve assets using it 211 # If nginx is available serve assets using it
199 if [ -d /usr/share/nginx ]; then 212 if [ -d /usr/share/nginx ]; then
200 - ln -s /var/lib/colab-assets /usr/share/nginx/colab 213 + ln -s /var/lib/colab/assets /usr/share/nginx/colab
201 fi 214 fi
202 215
203 yes yes | colab-admin collectstatic 216 yes yes | colab-admin collectstatic