Merge Request #30
← To merge requests
From
rpm
into
master
RPM update
Fix integration with Mailman and added BROWSERID_ENABLED variable in default settings.yaml
Commits (3)
-
Signed-off-by: Alexandre Barbosa <alexandreab@live.com> Signed-off-by: Antonio Terceiro <terceiro@softwarelivre.org>
-
Also move creation of assets symlink to the package build Signed-off-by: Alexandre Barbosa <alexandreab@live.com> Signed-off-by: Antonio Terceiro <terceiro@softwarelivre.org>
2 participants
Showing
1 changed file
Show diff stats
colab.spec
| @@ -46,6 +46,9 @@ find %{buildvenv} -type d -empty -delete | @@ -46,6 +46,9 @@ find %{buildvenv} -type d -empty -delete | ||
| 46 | mkdir -p %{buildroot}/etc/colab | 46 | mkdir -p %{buildroot}/etc/colab |
| 47 | mkdir -p %{buildroot}/usr/lib | 47 | mkdir -p %{buildroot}/usr/lib |
| 48 | 48 | ||
| 49 | +mkdir -p %{buildroot}/usr/share/nginx/ | ||
| 50 | +ln -s /var/lib/colab-assets %{buildroot}/usr/share/nginx/colab | ||
| 51 | + | ||
| 49 | # install virtualenv | 52 | # install virtualenv |
| 50 | rm -rf %{buildroot}/usr/lib/colab | 53 | rm -rf %{buildroot}/usr/lib/colab |
| 51 | cp -r %{buildvenv} %{buildroot}/usr/lib/colab | 54 | cp -r %{buildvenv} %{buildroot}/usr/lib/colab |
| @@ -78,6 +81,7 @@ rm -rf %{buildvenv} | @@ -78,6 +81,7 @@ rm -rf %{buildvenv} | ||
| 78 | %{_bindir}/* | 81 | %{_bindir}/* |
| 79 | /etc/cron.d/colab | 82 | /etc/cron.d/colab |
| 80 | /lib/systemd/system/colab.service | 83 | /lib/systemd/system/colab.service |
| 84 | +/usr/share/nginx/colab | ||
| 81 | 85 | ||
| 82 | %post | 86 | %post |
| 83 | groupadd colab || true | 87 | groupadd colab || true |
| @@ -85,6 +89,8 @@ if ! id colab; then | @@ -85,6 +89,8 @@ if ! id colab; then | ||
| 85 | useradd --system --gid colab --home-dir /usr/lib/colab --no-create-home colab | 89 | useradd --system --gid colab --home-dir /usr/lib/colab --no-create-home colab |
| 86 | fi | 90 | fi |
| 87 | 91 | ||
| 92 | +usermod --append --groups mailman colab | ||
| 93 | + | ||
| 88 | # only applies if there is a local PostgreSQL server | 94 | # only applies if there is a local PostgreSQL server |
| 89 | if [ -x /usr/bin/postgres ]; then | 95 | if [ -x /usr/bin/postgres ]; then |
| 90 | 96 | ||
| @@ -151,6 +157,9 @@ ROBOTS_NOINDEX: false | @@ -151,6 +157,9 @@ ROBOTS_NOINDEX: false | ||
| 151 | #PROXIED_APPS: | 157 | #PROXIED_APPS: |
| 152 | # gitlab: | 158 | # gitlab: |
| 153 | # upstream: 'http://localhost:8080/gitlab/' | 159 | # upstream: 'http://localhost:8080/gitlab/' |
| 160 | + | ||
| 161 | +## Enabled BROWSER_ID protocol | ||
| 162 | +# BROWSERID_ENABLED: True | ||
| 154 | EOF | 163 | EOF |
| 155 | chown root:colab /etc/colab/settings.yaml | 164 | chown root:colab /etc/colab/settings.yaml |
| 156 | chmod 0640 /etc/colab/settings.yaml | 165 | chmod 0640 /etc/colab/settings.yaml |
| @@ -179,9 +188,8 @@ fi | @@ -179,9 +188,8 @@ fi | ||
| 179 | mkdir -p /var/lib/colab-assets | 188 | mkdir -p /var/lib/colab-assets |
| 180 | chown colab:colab /var/lib/colab-assets | 189 | chown colab:colab /var/lib/colab-assets |
| 181 | 190 | ||
| 182 | -mkdir -p /usr/share/nginx/ | ||
| 183 | - | ||
| 184 | -ln -s /var/lib/colab-assets /usr/share/nginx/colab | 191 | +mkdir -p /var/lock/colab |
| 192 | +chown colab:colab /var/lock/colab | ||
| 185 | 193 | ||
| 186 | if [ -f /etc/colab/settings.yaml ]; then | 194 | if [ -f /etc/colab/settings.yaml ]; then |
| 187 | yes yes | colab-admin collectstatic | 195 | yes yes | colab-admin collectstatic |