Skip to content

Commit 754a107

Browse files
redmine: remove completely
Change-Id: I0ae0eae5d5619287aeae95c33c1bcbb19b123fed Story: 55 Task: 143
1 parent 02f3e0c commit 754a107

28 files changed

+11
-522
lines changed

config/ansible/roles/sf-gateway/templates/gateway.common.j2

-57
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
RewriteMap base64helper "prg:/usr/local/sbin/base64helper"
22

3-
# Don't login to Redmine itself, use cauth instead
4-
<LocationMatch "/redmine/login">
5-
RewriteEngine On
6-
RewriteRule ^(.*)$ /auth/login [R,NC,L]
7-
</LocationMatch>
8-
93
# Disable caching of static files
104
<LocationMatch "/static">
115
CacheDisable on
@@ -17,50 +11,6 @@
1711
RewriteRule ^(.*)$ /auth/login [R,NC,L]
1812
</LocationMatch>
1913

20-
# TODO: make /issues/ location bug-tracker awar
21-
<Location "/issues/">
22-
RewriteEngine On
23-
RewriteRule "/issues(.*$)" "/redmine/issues/$1" [R]
24-
</Location>
25-
26-
{% if 'redmine' in roles %}
27-
<Location /redmine/>
28-
ProxyPassReverse /
29-
30-
ProxyHTMLURLMap / /redmine/
31-
ProxyHTMLURLMap /redmine/ /redmine/
32-
33-
SetOutputFilter INFLATE;proxy-html;DEFLATE
34-
35-
ProxyHTMLMeta On
36-
ProxyHTMLEnable On
37-
38-
# Included example from /usr/share/doc/httpd-2.4.6/proxy-html.conf
39-
ProxyHTMLLinks a href
40-
ProxyHTMLLinks area href
41-
ProxyHTMLLinks link href
42-
ProxyHTMLLinks img src longdesc usemap
43-
ProxyHTMLLinks object classid codebase data usemap
44-
ProxyHTMLLinks q cite
45-
ProxyHTMLLinks blockquote cite
46-
ProxyHTMLLinks ins cite
47-
ProxyHTMLLinks del cite
48-
ProxyHTMLLinks form action
49-
ProxyHTMLLinks input src usemap
50-
ProxyHTMLLinks head profile
51-
ProxyHTMLLinks base href
52-
ProxyHTMLLinks script src for
53-
54-
ProxyHTMLEvents onclick ondblclick onmousedown onmouseup \
55-
onmouseover onmousemove onmouseout onkeypress \
56-
onkeydown onkeyup onfocus onblur onload \
57-
onunload onsubmit onreset onselect onchange
58-
59-
# Non-default addition for Redmine
60-
ProxyHTMLLinks option value
61-
</Location>
62-
{% endif %}
63-
6414
<LocationMatch "/r/(?!(login|logout|a))">
6515
RewriteEngine On
6616

@@ -137,12 +87,6 @@
13787
ProxyPass /manage/ http://managesf:20001/ retry=0
13888
ProxyPassReverse /manage/ http://managesf:20001/
13989

140-
{% if 'redmine' in roles %}
141-
ProxyPass /redmine/ {{ redmine_internal_url }} nocanon retry=0
142-
ProxyPassReverse /redmine/ {{ redmine_internal_url }}
143-
ProxyHTMLURLMap {{ redmine_internal_url }} /redmine/
144-
{% endif %}
145-
14690
ProxyPass /etherpad/ http://127.0.0.1:9001/ retry=0
14791
ProxyPassReverse /etherpad/ http://127.0.0.1:9001/
14892

@@ -184,7 +128,6 @@
184128

185129
RewriteEngine On
186130
RewriteRule ^/$ /{{ welcome_page_path }} [R]
187-
RewriteRule ^/redmine/redmine/(.*)$ /redmine/$1 [R=301,L]
188131

189132
<Location "/dashboard">
190133
RewriteEngine on

config/ansible/roles/sf-gateway/templates/topmenu.html.j2

-3
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@
3232
{% if 'kibana' in roles %}
3333
<li><a href="/app/kibana" target="_top">Kibana</a></li>
3434
{% endif %}
35-
{% if 'redmine' in roles %}
36-
<li><a href="/redmine/" target="_top">Redmine</a></li>
37-
{% endif %}
3835
{% if 'etherpad' in roles %}
3936
<li><a href="/etherpad/" target="_top">Etherpad</a></li>
4037
{% endif %}

config/ansible/roles/sf-gerrit/templates/change-merged.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# License for the specific language governing permissions and limitations
1515
# under the License.
1616

17-
# This hook will update a Redmine issue by:
17+
# This hook will update an issue by:
1818
# - changing its status to closed
1919
# - add an issue note with :
2020
# - The review URL

config/ansible/roles/sf-gerrit/templates/patchset-created.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# License for the specific language governing permissions and limitations
1515
# under the License.
1616

17-
# This hook will update a Redmine issue by:
17+
# This hook will update an issue by:
1818
# - changing its status to in-progess
1919
# - add an issue note with the review URL
2020

config/ansible/roles/sf-managesf/defaults/main.yml

-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ role_actions:
44
- update
55
- get_logs
66

7-
redmine_api_url: "http://api-redmine.{{ fqdn }}:8083/"
8-
roles: []
9-
107
managesf_loglevel: INFO
118
managesf_root_loglevel: WARNING
129

config/ansible/roles/sf-managesf/templates/config.py.j2

-14
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,9 @@ auth = {
6565
}
6666

6767
services = [
68-
# Because of http://softwarefactory-project.io/redmine/issues/1466
69-
# Add storyboard service at the begining
7068
{% if 'storyboard' in roles %}
7169
'SFStoryboard',
7270
{% endif %}
73-
{% if 'redmine' in roles %}
74-
'SFRedmine',
75-
{% endif %}
7671
{% if 'gerrit' in roles %}
7772
'SFGerrit',
7873
{% endif %}
@@ -141,15 +136,6 @@ nodepool = {
141136
}
142137
{% endif %}
143138

144-
{% if 'redmine' in roles %}
145-
redmine = {
146-
'host': 'api-redmine.{{ fqdn }}',
147-
'url': '{{ redmine_api_url }}',
148-
'db_url': 'mysql://managesf:{{ managesf_mysql_password }}@mysql.{{ fqdn }}/redmine?charset=utf8',
149-
'api_key': '{{ redmine_api_key }}',
150-
}
151-
{% endif %}
152-
153139
{% if 'storyboard' in roles %}
154140
storyboard = {
155141
'base_url': '{{ gateway_url }}',

config/ansible/roles/sf-redmine/defaults/main.yml

-17
This file was deleted.

config/ansible/roles/sf-redmine/files/configuration.yml

-3
This file was deleted.

config/ansible/roles/sf-redmine/files/monit

-2
This file was deleted.

config/ansible/roles/sf-redmine/meta/main.yml

-12
This file was deleted.

config/ansible/roles/sf-redmine/tasks/get_logs.yml

-4
This file was deleted.

config/ansible/roles/sf-redmine/tasks/main.yml

-3
This file was deleted.

config/ansible/roles/sf-redmine/tasks/setup.yml

-107
This file was deleted.

config/ansible/roles/sf-redmine/templates/database.yml.j2

-6
This file was deleted.

config/ansible/roles/sf-redmine/templates/postconf.sql.j2

-67
This file was deleted.

0 commit comments

Comments
 (0)