Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
float
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container registry
Model registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ai3
float
Commits
aeaf1395
Commit
aeaf1395
authored
5 years ago
by
ale
Browse files
Options
Downloads
Plain Diff
Merge branch 'nginx-error-log' into 'master'
Nginx error log See merge request
!118
parents
59c8a0c8
8fca277b
No related branches found
No related tags found
1 merge request
!118
Nginx error log
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
roles/nginx/files/nginx.service
+1
-1
1 addition, 1 deletion
roles/nginx/files/nginx.service
roles/nginx/templates/config/nginx.conf
+1
-1
1 addition, 1 deletion
roles/nginx/templates/config/nginx.conf
with
2 additions
and
2 deletions
roles/nginx/files/nginx.service
+
1
−
1
View file @
aeaf1395
...
...
@@ -12,7 +12,7 @@ PIDFile=/run/nginx/nginx.pid
# option, force ownership here or nginx will refuse to (re)start.
ExecStartPre
=
+/usr/bin/install -v -d -m 700 -o nginx -g nginx /var/cache/nginx /var/cache/nginx/temp
ExecStartPre
=
/usr/sbin/nginx -t -q -g 'daemon on; master_process on; error_log stderr;'
ExecStart
=
/usr/sbin/nginx -g 'daemon on; master_process on; error_log
stderr
;'
ExecStart
=
/usr/sbin/nginx -g 'daemon on; master_process on; error_log
/dev/null
;'
ExecReload
=
/usr/sbin/nginx -g 'daemon on; master_process on; error_log stderr;' -s reload
ExecStop
=
/bin/kill -TERM $MAINPID
...
...
This diff is collapsed.
Click to expand it.
roles/nginx/templates/config/nginx.conf
+
1
−
1
View file @
aeaf1395
...
...
@@ -6,7 +6,7 @@ events {
}
pid
/run/nginx/nginx.pid
;
error_log
syslog:server=unix:/dev/log,tag=nginx
;
error_log
syslog:server=unix:/dev/log,tag=nginx
,nohostname
;
http
{
server_tokens
off
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment