Skip to content

Commit f2fd0f7

Browse files
committed
change domain of alignment and microsite
1 parent 2d3ffe4 commit f2fd0f7

File tree

7 files changed

+60
-12
lines changed

7 files changed

+60
-12
lines changed

docker-config/alignmentui/.env

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ APP_ENV=production
22
APP_KEY=
33
APP_DEBUG=true
44
APP_LOG_LEVEL=debug
5-
APP_URL=https://alignment-obeu.iais.fraunhofer.de
5+
APP_URL=https://apps.openbudgets.eu/alignmentui
66

77
DB_CONNECTION=mysql
88
DB_HOST=alignmentmysql
@@ -30,5 +30,5 @@ MAIL_ENCRYPTION=null
3030
GITHUB_driver=true
3131
GITHUB_client_ID=$GITHUB_CLIENT_ID
3232
GITHUB_client_secret=$GITHUB_CLIENT_SECRET
33-
GITHUB_callback=https://alignment-obeu.iais.fraunhofer.de/auth/github/callback
33+
GITHUB_callback=https://apps.openbudgets.eu/alignmentui/auth/github/callback
3434

docker-config/alignmentui/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ WORKDIR $APP_DIR
4444
EXPOSE 80
4545

4646
RUN git clone https://github.com/okgreece/Alignment.git $APP_DIR && \
47-
cd $APP_DIR && git checkout 02327e89748654a7f0f3662b56006db95c0ddbd7
47+
cd $APP_DIR && git checkout 1b8f6e0bfcb079c695a20b30ef736c42b96de896
4848
COPY ./.env $APP_DIR/.env
4949
# For https:
5050
COPY ./AppServiceProvider.php $APP_DIR/app/Providers/AppServiceProvider.php

docker-config/microsite/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ RUN apt-get update -y && \
44
apt-get install -y supervisor git
55

66
RUN git clone https://github.com/openbudgets/microsite
7-
RUN cd /microsite && git pull origin master && git checkout d936d385f52af0cd452941286a9912aeca537267
7+
RUN cd /microsite && git pull origin master && git checkout f7cc9ce8d2e5f21299ba7b9a7ab682bab6c62ba0
88

99
COPY ./supervisord.conf /etc/supervisord.conf
1010
COPY ./start.sh /start.sh

docker-config/microsite/urls.py

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
"""microsite_backend URL Configuration
2+
3+
The `urlpatterns` list routes URLs to views. For more information please see:
4+
https://docs.djangoproject.com/en/1.9/topics/http/urls/
5+
Examples:
6+
Function views
7+
1. Add an import: from my_app import views
8+
2. Add a URL to urlpatterns: url(r'^$', views.home, name='home')
9+
Class-based views
10+
1. Add an import: from other_app.views import Home
11+
2. Add a URL to urlpatterns: url(r'^$', Home.as_view(), name='home')
12+
Including another URLconf
13+
1. Import the include() function: from django.conf.urls import url, include
14+
2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls'))
15+
"""
16+
from django.conf.urls import url, include
17+
from django.contrib import admin
18+
from django.contrib.staticfiles.urls import staticfiles_urlpatterns
19+
from vizmanager.admin import ma_site
20+
import vizmanager
21+
22+
23+
admin.site.site_header = 'OpenBudgets Microsite Manager'
24+
admin.site.site_title = 'Microsite Manager'
25+
admin.site.index_title = 'Microsite Manager'
26+
27+
urlpatterns = [
28+
url(r'^/admin/', admin.site.urls),
29+
url(r'^/manage/', ma_site.urls),
30+
url(r'^/vizmanager/', include('vizmanager.urls', namespace='vizmanager')),
31+
]
32+
33+
urlpatterns += staticfiles_urlpatterns()

docker-config/nginx/conf/includes/https_server_eis_obeu.conf

+4-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ server {
1515
keepalive_timeout 65;
1616
gzip on;
1717

18-
ssl_certificate_key /etc/letsencrypt/live/eis-openbudgets.iais.fraunhofer.de/privkey.pem;
19-
ssl_certificate /etc/letsencrypt/live/eis-openbudgets.iais.fraunhofer.de/fullchain.pem;
18+
ssl_certificate_key /etc/letsencrypt/live/apps.openbudgets.eu/privkey.pem;
19+
ssl_certificate /etc/letsencrypt/live/apps.openbudgets.eu/fullchain.pem;
2020
ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
2121
ssl_prefer_server_ciphers on;
2222
ssl_ciphers 'EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH';
@@ -29,6 +29,8 @@ server {
2929
include includes/locations/linkedpipes.conf;
3030

3131
include includes/locations/okgr_apps.conf;
32+
33+
include includes/locations/alignment.conf;
3234

3335
include includes/locations/staticfiles.conf;
3436

docker-config/nginx/conf/includes/locations/microsite.conf

-6
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
######################### Microsite ###########################
22

33
location /microsite/ {
4-
proxy_set_header Host $host;
5-
proxy_set_header X-Real-IP $remote_addr;
6-
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
7-
proxy_set_header X-Forwarded-Proto $scheme;
8-
94
add_header Strict-Transport-Security "max-age=0; includeSubdomains;";
105
add_header Cache-Control "no-store, no-cache, must-revalidate";
116
expires -1;
12-
137
proxy_pass http://microsite:8000/;
148
}
159

letsencrypt/letsEncryptProductionCert

+19
Original file line numberDiff line numberDiff line change
@@ -65,5 +65,24 @@ docker run --rm --name letsencrypt \
6565
-d alignment-obeu.iais.fraunhofer.de \
6666
6767

68+
docker run --rm --name letsencrypt \
69+
-p 1086:80 \
70+
-v "$PWD/../volumes/nginx/letsencrypt/etc:/etc/letsencrypt" \
71+
-v "$PWD/../volumes/nginx/letsencrypt/lib:/var/lib/letsencrypt" \
72+
-v "$PWD/../volumes/nginx/letsencrypt/www:/var/www" \
73+
letsencrypt_img \
74+
certonly \
75+
--authenticator webroot \
76+
--webroot \
77+
--webroot-path /var/www \
78+
--agree-tos \
79+
--text \
80+
--non-interactive \
81+
--renew-by-default \
82+
--rsa-key-size 4096 \
83+
-d apps.openbudgets.eu \
84+
85+
86+
6887

6988
#docker kill --signal=HUP dockerconfig_nginx_1

0 commit comments

Comments
 (0)