Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Client
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
web-et-numerique
Factory
Resin
Client
Compare revisions
5f66f4dc415e3e7570f856a9b4b28f54615afe9e to 8b42053cb5543059b167c8119a5b70baf01b58c0
Compare revisions
Changes are shown as if the
source
revision was being merged into the
target
revision.
Learn more about comparing revisions.
Source
web-et-numerique/factory/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client
Select target project
No results found
8b42053cb5543059b167c8119a5b70baf01b58c0
Select Git revision
Swap
Target
web-et-numerique/factory/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client
Select target project
web-et-numerique/factory/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client
1 result
5f66f4dc415e3e7570f856a9b4b28f54615afe9e
Select Git revision
Show changes
Only incoming changes from source
Include changes to target since source was created
Compare
Commits on Source (2)
feat(jeuIA): store nginx logs
· 21d189b2
Etienne LOUPIAS
authored
2 days ago
21d189b2
Merge branch '683-stats-qr-code' into 'dev'
· 8b42053c
Etienne LOUPIAS
authored
2 days ago
Store nginx logs See merge request
!991
8b42053c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Dockerfile
+0
-1
0 additions, 1 deletion
Dockerfile
nginx/nginx.conf
+0
-31
0 additions, 31 deletions
nginx/nginx.conf
nginx/templates/default.conf.template
+21
-0
21 additions, 0 deletions
nginx/templates/default.conf.template
with
21 additions
and
32 deletions
Dockerfile
View file @
8b42053c
...
...
@@ -16,7 +16,6 @@ COPY angular.json .
COPY
tsconfig.json .
COPY
tsconfig.app.json .
COPY
ngsw-config.json .
COPY
/nginx/nginx.conf .
COPY
/src ./src
ARG
conf
...
...
This diff is collapsed.
Click to expand it.
nginx/nginx.conf
deleted
100644 → 0
View file @
5f66f4dc
worker_processes
1
;
error_log
/var/log/nginx/error.log
warn
;
pid
/var/run/nginx.pid
;
events
{
worker_connections
1024
;
}
http
{
include
/etc/nginx/mime.types
;
default_type
application/octet-stream
;
log_format
main
'
$remote_addr
-
$remote_user
[
$time_local
]
"
$request
"
'
'
$status
$body_bytes_sent
"
$http_referer
"
'
'"
$http_user_agent
"
"
$http_x_forwarded_for
"'
'"
$upstream_uri
"'
;
access_log
/var/log/nginx/access.log
main
;
sendfile
on
;
keepalive_timeout
65
;
gzip
on
;
include
/etc/nginx/conf.d/*.conf
;
# Max Body Size
client_max_body_size
10M
;
}
This diff is collapsed.
Click to expand it.
nginx/templates/default.conf.template
View file @
8b42053c
...
...
@@ -23,6 +23,19 @@ map $http_user_agent $prerender {
"~*discordbot" 1;
}
map $time_iso8601 $year {
default '0000';
"~^(\d{4})-(\d{2})-(\d{2})" $1;
}
map $time_iso8601 $month {
default '00';
"~^(\d{4})-(\d{2})-(\d{2})" $2;
}
map $time_iso8601 $day {
default '00';
"~^(\d{4})-(\d{2})-(\d{2})" $3;
}
server {
listen 8080 default_server;
...
...
@@ -42,6 +55,14 @@ server {
proxy_pass https://data.grandlyon.com/fr/datapusher/ws/grandlyon/adr_voie_lieu.adrcomgl/all.json;
}
# Persist logs for jeuAieAieIA
location /shared/jeuAieAieIA {
# Default log which is redirected to stdout (must be reset in this block because of "access_log" below)
access_log /var/log/nginx/access.log main;
# And also write to a daily file
access_log /usr/share/nginx/html/shared/jeuAieAieIA/stats/log/access.$year-$month-$day.log main;
}
location / {
add_header X-Frame-Options SAMEORIGIN always;
add_header X-Content-Type-Options nosniff;
...
...
This diff is collapsed.
Click to expand it.