Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
nomad-lab
nomad-FAIR
Commits
759e1bdd
Commit
759e1bdd
authored
Jun 19, 2020
by
Markus Scheidgen
Browse files
Adapted matomo.
parent
e5eb020b
Pipeline
#76961
passed with stages
in 22 minutes and 28 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
gui/src/index.js
View file @
759e1bdd
...
...
@@ -17,7 +17,7 @@ export const matomo = matomoEnabled ? PiwikReactRouter({
url
:
matomoUrl
,
siteId
:
matomoSiteId
,
clientTrackerName
:
'
stat.js
'
,
serverTrackerName
:
'
stat
.php
'
serverTrackerName
:
'
stat
'
})
:
null
const
keycloak
=
Keycloak
({
...
...
ops/docker-compose/matomo/docker-compose.yml
View file @
759e1bdd
...
...
@@ -7,10 +7,11 @@ services:
-
MARIADB_USER=bn_matomo
-
MARIADB_DATABASE=bitnami_matomo
-
ALLOW_EMPTY_PASSWORD=yes
volumes
:
-
/nomad/fairdi/db/matomo/mariadb:/bitnami
volumes
:
-
/nomad/fairdi/db/matomo/mariadb:/bitnami
matomo
:
image
:
'
bitnami/matomo:3'
build
:
./matomo
image
:
'
fairdi/matomo:3'
container_name
:
nomad_matomo_matomo
environment
:
-
MARIADB_HOST=mariadb
...
...
@@ -22,5 +23,5 @@ services:
-
'
8001:80'
depends_on
:
-
mariadb
volumes
:
-
/nomad/fairdi/db/matomo/matomo:/bitnami
volumes
:
-
/nomad/fairdi/db/matomo/matomo:/bitnami
ops/docker-compose/matomo/matomo/Dockerfile
0 → 100644
View file @
759e1bdd
FROM
bitnami/matomo:3
RUN
sed
-i
-e
's/action_name=/a=b\&action_name=/g'
/opt/bitnami/matomo/piwik.js
RUN
sed
-i
-e
's/&send_image=0/\&/g'
/opt/bitnami/matomo/piwik.js
\ No newline at end of file
ops/docker-compose/matomo/reverse-proxy.apach2
View file @
759e1bdd
RewriteRule "^/fairdi/stat/stat.js$" "http://<the ip address>:8001/piwik.js" [p]
RewriteRule "^/fairdi/stat/stat
.php
$" "http://<the ip address>:8001/piwik.php" [p]
RewriteRule "^/fairdi/stat/stat$" "http://<the ip address>:8001/piwik.php" [p]
ProxyPass /fairdi/stat http://<the ip address>:8001
ProxyPassReverse /fairdi/stat http://<the ip address>:8001
<Proxy http://<the ip address>:8001/app>
...
...
ops/docker-compose/matomo/reverse-proxy.nginx
View file @
759e1bdd
location /fairdi/stat {
rewrite ^(.*)/stat.js$ $1/piwik.js;
rewrite ^(.*)/stat
.php
$ $1/piwik.php;
rewrite ^(.*)/stat$ $1/piwik.php;
rewrite ^/fairdi/stat/(.*)$ /$1 break;
proxy_set_header X-Forwarded-Uri /fairdi/stat;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment