Download as
Browse Code »

Commit 84020ff4bffcf3c6147af674f3029c87c2800718

Authored by Sergio Oliveira
1 parent a621653f
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Scripts to update obs package and bumpinp down version

Showing 4 changed files with 74 additions and 37 deletions   Show diff stats
@@ -22,3 +22,6 @@ coverage_report/ @@ -22,3 +22,6 @@ coverage_report/
22 22
23 # Whoosh Index 23 # Whoosh Index
24 tests/whoosh_index/ 24 tests/whoosh_index/
  25 +
  26 +# Open Build System
  27 +.obs/
1 %define name colab 1 %define name colab
2 -%define version 2.0a3  
3 -%define unmangled_version 2.0a3  
4 -%define release 3 2 +%define version 1.9
  3 +%define unmangled_version 1.9
5 %define buildvenv /var/tmp/%{name}-%{version} 4 %define buildvenv /var/tmp/%{name}-%{version}
6 5
7 Summary: Collaboration platform for communities 6 Summary: Collaboration platform for communities
@@ -46,9 +45,6 @@ find %{buildvenv} -type d -empty -delete @@ -46,9 +45,6 @@ find %{buildvenv} -type d -empty -delete
46 mkdir -p %{buildroot}/etc/colab 45 mkdir -p %{buildroot}/etc/colab
47 mkdir -p %{buildroot}/usr/lib 46 mkdir -p %{buildroot}/usr/lib
48 47
49 -mkdir -p %{buildroot}/usr/share/nginx/  
50 -ln -s /var/lib/colab-assets %{buildroot}/usr/share/nginx/colab  
51 -  
52 # install virtualenv 48 # install virtualenv
53 rm -rf %{buildroot}/usr/lib/colab 49 rm -rf %{buildroot}/usr/lib/colab
54 cp -r %{buildvenv} %{buildroot}/usr/lib/colab 50 cp -r %{buildvenv} %{buildroot}/usr/lib/colab
@@ -81,7 +77,6 @@ rm -rf %{buildvenv} @@ -81,7 +77,6 @@ rm -rf %{buildvenv}
81 %{_bindir}/* 77 %{_bindir}/*
82 /etc/cron.d/colab 78 /etc/cron.d/colab
83 /lib/systemd/system/colab.service 79 /lib/systemd/system/colab.service
84 -/usr/share/nginx/colab  
85 80
86 %post 81 %post
87 groupadd colab || true 82 groupadd colab || true
@@ -89,8 +84,6 @@ if ! id colab; then @@ -89,8 +84,6 @@ if ! id colab; then
89 useradd --system --gid colab --home-dir /usr/lib/colab --no-create-home colab 84 useradd --system --gid colab --home-dir /usr/lib/colab --no-create-home colab
90 fi 85 fi
91 86
92 -usermod --append --groups mailman colab  
93 -  
94 mkdir -p /etc/colab 87 mkdir -p /etc/colab
95 88
96 if [ ! -f /etc/colab/settings.yaml ]; then 89 if [ ! -f /etc/colab/settings.yaml ]; then
@@ -102,12 +95,12 @@ TEMPLATE_DEBUG: true @@ -102,12 +95,12 @@ TEMPLATE_DEBUG: true
102 95
103 ## System admins 96 ## System admins
104 ADMINS: &admin 97 ADMINS: &admin
105 --  
106 - - John Foo  
107 - - john@example.com  
108 --  
109 - - Mary Bar  
110 - - mary@example.com 98 + -
  99 + - John Foo
  100 + - john@example.com
  101 + -
  102 + - Mary Bar
  103 + - mary@example.com
111 104
112 MANAGERS: *admin 105 MANAGERS: *admin
113 106
@@ -120,15 +113,15 @@ EMAIL_SUBJECT_PREFIX: '[colab]' @@ -120,15 +113,15 @@ EMAIL_SUBJECT_PREFIX: '[colab]'
120 113
121 SECRET_KEY: '$SECRET_KEY' 114 SECRET_KEY: '$SECRET_KEY'
122 115
123 -SITE_URL: 'http://localhost:8000' 116 +SITE_URL: 'http://localhost:8001/'
124 BROWSERID_AUDIENCES: 117 BROWSERID_AUDIENCES:
125 -- http://localhost:8000 118 + - http://localhost:8001
126 # - http://example.com 119 # - http://example.com
127 # - https://example.org 120 # - https://example.org
128 # - http://example.net 121 # - http://example.net
129 122
130 ALLOWED_HOSTS: 123 ALLOWED_HOSTS:
131 -- localhost 124 + - localhost
132 # - example.com 125 # - example.com
133 # - example.org 126 # - example.org
134 # - example.net 127 # - example.net
@@ -136,12 +129,8 @@ ALLOWED_HOSTS: @@ -136,12 +129,8 @@ ALLOWED_HOSTS:
136 ## Disable indexing 129 ## Disable indexing
137 ROBOTS_NOINDEX: false 130 ROBOTS_NOINDEX: false
138 131
139 -#PROXIED_APPS:  
140 -# gitlab:  
141 -# upstream: 'http://localhost:8080/gitlab/'  
142 -  
143 -## Enabled BROWSER_ID protocol  
144 -# BROWSERID_ENABLED: True 132 +## Disable browser id authentication
  133 +# BROWSERID_ENABLED: true
145 EOF 134 EOF
146 chown root:colab /etc/colab/settings.yaml 135 chown root:colab /etc/colab/settings.yaml
147 chmod 0640 /etc/colab/settings.yaml 136 chmod 0640 /etc/colab/settings.yaml
@@ -152,18 +141,17 @@ mkdir -p /etc/colab/settings.d @@ -152,18 +141,17 @@ mkdir -p /etc/colab/settings.d
152 if [ ! -f /etc/colab/settings.d/00-database.yaml ]; then 141 if [ ! -f /etc/colab/settings.d/00-database.yaml ]; then
153 cat > /etc/colab/settings.d/00-database.yaml <<EOF 142 cat > /etc/colab/settings.d/00-database.yaml <<EOF
154 DATABASES: 143 DATABASES:
155 -default:  
156 - ENGINE: django.db.backends.postgresql_psycopg2  
157 - NAME: colab  
158 - USER: colab  
159 - HOST: localhost  
160 - PORT: 5432 144 + default:
  145 + ENGINE: django.db.backends.postgresql_psycopg2
  146 + NAME: colab
  147 + USER: colab
  148 + HOST: localhost
  149 + PORT: 5432
161 EOF 150 EOF
162 chown root:colab /etc/colab/settings.d/00-database.yaml 151 chown root:colab /etc/colab/settings.d/00-database.yaml
163 chmod 0640 /etc/colab/settings.d/00-database.yaml 152 chmod 0640 /etc/colab/settings.d/00-database.yaml
164 fi 153 fi
165 154
166 -  
167 # only applies if there is a local PostgreSQL server 155 # only applies if there is a local PostgreSQL server
168 if [ -x /usr/bin/postgres ]; then 156 if [ -x /usr/bin/postgres ]; then
169 157
@@ -188,10 +176,9 @@ fi @@ -188,10 +176,9 @@ fi
188 mkdir -p /var/lib/colab-assets 176 mkdir -p /var/lib/colab-assets
189 chown colab:colab /var/lib/colab-assets 177 chown colab:colab /var/lib/colab-assets
190 178
191 -mkdir -p /var/lock/colab  
192 -chown colab:colab /var/lock/colab 179 +mkdir -p /usr/share/nginx/
193 180
194 -if [ -f /etc/colab/settings.yaml ]; then  
195 - yes yes | colab-admin collectstatic  
196 -fi 181 +ln -s /var/lib/colab-assets /usr/share/nginx/colab
  182 +
  183 +yes yes | colab-admin collectstatic
197 184
@@ -65,7 +65,7 @@ EXCLUDE_FROM_PACKAGES = [] @@ -65,7 +65,7 @@ EXCLUDE_FROM_PACKAGES = []
65 65
66 setup( 66 setup(
67 name='colab', 67 name='colab',
68 - version='2.0a3', 68 + version='1.9',
69 url='https://github.com/colab-community/colab', 69 url='https://github.com/colab-community/colab',
70 author='Sergio Oliveira', 70 author='Sergio Oliveira',
71 author_email='sergio@tracy.com.br', 71 author_email='sergio@tracy.com.br',
update_obs.sh 0 → 100755
  Diff comments   View file @84020ff
@@ -0,0 +1,47 @@ @@ -0,0 +1,47 @@
  1 +#!/bin/bash
  2 +
  3 +which -s osc || { echo "osc must be installed"; exit 1; }
  4 +
  5 +VERSION=`python setup.py --version`
  6 +
  7 +pull_obs () {
  8 + if [ -d .obs ]
  9 + then
  10 + osc update .obs/
  11 + else
  12 + osc checkout isv:spb:colab/colab --output-dir=".obs/"
  13 + fi
  14 +}
  15 +
  16 +update_sdist () {
  17 + rm -fR dist/
  18 + python setup.py sdist
  19 +}
  20 +
  21 +
  22 +add_to_obs () {
  23 + osc revert .obs/
  24 + osc rm -f .obs/colab-*.tar.gz
  25 +
  26 + cp dist/colab-*.tar.gz .obs/
  27 + cp colab.spec .obs/
  28 +
  29 + osc add .obs/colab-$VERSION.tar.gz
  30 +}
  31 +
  32 +
  33 +update_spec_versions () {
  34 + sed -i '' -E "s/(\%define (unmangled_)?version).*/\1 $VERSION/;" colab.spec
  35 +}
  36 +
  37 +
  38 +push_to_obs () {
  39 + echo
  40 +}
  41 +
  42 +update_sdist
  43 +update_spec_versions
  44 +
  45 +pull_obs
  46 +add_to_obs
  47 +push_to_obs