Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable cgimap for web container and update apache config #333

Merged
merged 4 commits into from
Jun 13, 2024
Merged

Enable cgimap for web container and update apache config #333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e086045
Enable cgimap
Rub21 Jun 10, 2024
4c1dab8
Update production config
Rub21 Jun 10, 2024
d8f3f66
Add parameter to restore backup file
Rub21 Jun 10, 2024
1707cdf
Update Apache config for cgimap
Rub21 Jun 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 15 additions & 23 deletions images/web/config/production.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,40 +6,32 @@
RewriteEngine On
RewriteCond %{HTTP:X-Forwarded-Proto} =http
# Development mode in case domain is localhost

# ======Redirect to HTTPS
RewriteCond %{HTTP_HOST} !=localhost
RewriteCond %{HTTP_HOST} !=127.0.0.1
# RewriteCond %{HTTPS} off
# RewriteRule .* https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301]
RewriteCond %{HTTPS} off
RewriteRule .* https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301]

# ======Redirect to wwww osmseed.org
# RewriteCond %{HTTP_HOST} =osmseed.org
# RewriteCond %{HTTP_HOST} !^www\. [NC]
# RewriteRule .* https://www.%{HTTP_HOST}%{REQUEST_URI} [L,R=301]

# <Location />
# # For TM, do not use cgimap auth.
# <If "%{HTTP_REFERER} !~ m#https://tasks(-\w+)?\.osmseed\.org/#">
# CGIPassAuth On
# </If>
# </Location>
<Location />
CGIPassAuth On
</Location>

# ======Proxying traffic to CGImap====
# RewriteCond %{REQUEST_URI} ^/api/0\.6/map
# RewriteRule ^/api/0\.6/map(\.json|\.xml)?$ fcgi://127.0.0.1:8000$0 [P]
# RewriteCond %{REQUEST_METHOD} ^(HEAD|GET)$
# RewriteRule ^/api/0\.6/(node|way|relation|changeset)/[0-9]+(\.json|\.xml)?$ fcgi://127.0.0.1:8000$0 [P]
# RewriteRule ^/api/0\.6/(node|way|relation)/[0-9]+/history(\.json|\.xml)?$ fcgi://127.0.0.1:8000$0 [P]
# RewriteRule ^/api/0\.6/(node|way|relation)/[0-9]+/relations(\.json|\.xml)?$ fcgi://127.0.0.1:8000$0 [P]
# RewriteRule ^/api/0\.6/node/[0-9]+/ways(\.json|\.xml)?$ fcgi://127.0.0.1:8000$0 [P]
# RewriteRule ^/api/0\.6/(way|relation)/[0-9]+/full(\.json|\.xml)?$ fcgi://127.0.0.1:8000$0 [P]
# RewriteRule ^/api/0\.6/(nodes|ways|relations)(\.json|\.xml)?$ fcgi://127.0.0.1:8000$0 [P]

# For changeset requests originating from TM, do not use cgimap.
# RewriteCond %{REQUEST_METHOD} ^POST$
# RewriteCond %{HTTP_REFERER} !^https://tasks(-\w+)?\.osmseed\.org/ [NC]
# RewriteRule ^/api/0\.6/changeset/[0-9]+/(upload|download)(\.json|\.xml)?$ fcgi://127.0.0.1:8000$0 [P]
RewriteCond %{REQUEST_URI} ^/api/0\.6/map
RewriteRule ^/api/0\.6/map(\.json|\.xml)?$ fcgi://127.0.0.1:8000$0 [P]
RewriteCond %{REQUEST_METHOD} ^(HEAD|GET)$
RewriteRule ^/api/0\.6/(node|way|relation|changeset)/[0-9]+(\.json|\.xml)?$ fcgi://127.0.0.1:8000$0 [P]
RewriteRule ^/api/0\.6/(node|way|relation)/[0-9]+/history(\.json|\.xml)?$ fcgi://127.0.0.1:8000$0 [P]
RewriteRule ^/api/0\.6/(node|way|relation)/[0-9]+/relations(\.json|\.xml)?$ fcgi://127.0.0.1:8000$0 [P]
RewriteRule ^/api/0\.6/node/[0-9]+/ways(\.json|\.xml)?$ fcgi://127.0.0.1:8000$0 [P]
RewriteRule ^/api/0\.6/(way|relation)/[0-9]+/full(\.json|\.xml)?$ fcgi://127.0.0.1:8000$0 [P]
RewriteRule ^/api/0\.6/(nodes|ways|relations)(\.json|\.xml)?$ fcgi://127.0.0.1:8000$0 [P]
RewriteRule ^/api/0\.6/changeset/[0-9]+/(upload|download)(\.json|\.xml)?$ fcgi://127.0.0.1:8000$0 [P]

# Relax Apache security settings
<Directory /var/www/public>
Expand Down
20 changes: 10 additions & 10 deletions images/web/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,17 +70,17 @@ while "$flag" = true; do
fi
sleep 2
done &
# time rails i18n:js:export assets:precompile
time rails i18n:js:export assets:precompile
bundle exec rails db:migrate
# /usr/local/bin/openstreetmap-cgimap \
# --port=8000 \
# --daemon \
# --instances=10 \
# --dbname=$POSTGRES_DB \
# --host=$POSTGRES_HOST \
# --username=$POSTGRES_USER \
# --password=$POSTGRES_PASSWORD \
# --logfile log/cgimap.log
/usr/local/bin/openstreetmap-cgimap \
--port=8000 \
--daemon \
--instances=3 \
--dbname=$POSTGRES_DB \
--host=$POSTGRES_HOST \
--username=$POSTGRES_USER \
--password=$POSTGRES_PASSWORD \
--logfile log/cgimap.log
bundle exec rake jobs:work &
apachectl -k start -DFOREGROUND
done
4 changes: 4 additions & 0 deletions osm-seed/templates/web/web-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,10 @@ spec:
value: {{ .Values.web.env.API_TIMEOUT | default "30" | quote }}
- name: WEB_TIMEOUT
value: {{ .Values.web.env.WEB_TIMEOUT | default "30" | quote }}
# This parameter is specifically if you want to restore a any backup to db,
# you done need to set this values.yaml in case you don't use
- name: BACKUP_FILE_URL
value: {{ .Values.web.env.BACKUP_FILE_URL | default "none" | quote }}
volumeMounts:
- mountPath: /dev/shm
name: shared-memory
Expand Down
Loading