Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
aports
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
Releases
Model registry
Monitor
Service Desk
Analyze
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
alpine
aports
Commits
8f85c54b
Commit
8f85c54b
authored
2 years ago
by
Jakub Jirutka
Browse files
Options
Downloads
Patches
Plain Diff
main/nginx: move /etc/nginx/stream.conf to /etc/nginx/conf.d/
parent
d6f74be5
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!39304
[3.16] main/expat: security upgrade to 2.4.9
,
!37748
nginx: Include files with config snippets into the root context.
Pipeline
#136002
passed
2 years ago
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
main/nginx/APKBUILD
+3
-3
3 additions, 3 deletions
main/nginx/APKBUILD
main/nginx/nginx.conf
+0
-3
0 additions, 3 deletions
main/nginx/nginx.conf
main/nginx/stream.conf
+1
-1
1 addition, 1 deletion
main/nginx/stream.conf
with
4 additions
and
7 deletions
main/nginx/APKBUILD
+
3
−
3
View file @
8f85c54b
...
...
@@ -452,7 +452,7 @@ _module() {
;;
stream
)
mkdir
-p
./etc/nginx/stream.d
install
-m644
"
$srcdir
"
/stream.conf ./etc/nginx/stream.conf
install
-m644
-D
"
$srcdir
"
/stream.conf ./etc/nginx/
conf.d/
stream.conf
;;
esac
}
...
...
@@ -480,9 +480,9 @@ dfcfd4dd14ccb205ea80d28eae8cadd123015d5eddc004a31b7742d8117c69cad1b56868ba94dd75
ac0f912ae90e0083cc761a622290223edeed0bd32213bbe766d637ac2dfd9835d163e5d16ef28740cbad05d6d92cc418d62df3413c70b4f2c63db02f8ca1c7cc nginx_cookie_flag_module~fix-mem-allocations.patch
4db527d663dbe9e8b503c3cbaa4eae34b45990a5359b3bb98ce970c705faefcac98de49439f2557756a2be8e2e06acc67f98942de01674c498832d80c3cb90c3 njs~mktemp-busybox-compat.patch
df1d910d5a433ef8aa6620e46bd46cb82c45c840e35420bf81a76e5a868ac73ad88aa3934d1c11bcf004a88a9cd13bf69a96ee1b08540251b09903a30430b199 njs~nginx-1.20.x-compat.patch
68257307a2172da5fdde52988d82c19133ad67beadeee38477e7455af94249a7b1aa82ee04238eb0fb5a434eb91f187a9e95dca74ed2ea44b76ff2c884b85860
nginx.conf
f6f44b8f17d079ef4db4fc0507672e7aaa6b93cbae10f24c91232f089a8b7a0c2db92a148b2a16b1992cdcdcad3b686146f9b8e955693a50982dd8aa04f54b2d
nginx.conf
0907f69dc2d3dc1bad3a04fb6673f741f1a8be964e22b306ef9ae2f8e736e1f5733a8884bfe54f3553fff5132a0e5336716250f54272c3fec2177d6ba16986f3 default.conf
f3321a45736697009817db335ad36d3f1d05f60d98ac90a943220cdd4c00c52632f018db6a6076d5431a483525aacc5725b87b765b590e2f63b3ef98c5b16bd8
stream.conf
426f0c317322af7cab152f2070398c7aa5c059276ba504617a212f1e060bbb1dd9edc54e62d4cf5f14e3678235351c808ebeabe8b122757c74b3f505e8427106
stream.conf
09b110693e3f4377349ccea3c43cb8199c8579ee351eae34283299be99fdf764b0c1bddd552e13e4d671b194501618b29c822e1ad53b34101a73a63954363dbb nginx.logrotate
ee10a5687740dde0c3d18d8b3555f49fcdc6abfc0a3bc2de1de3be0e99951a346fe8027d916aab73071ecd4e2c50871e7c867aca3a7a0fd16e3374c5caed1c57 nginx.initd
0b9b9ed01ac077e334c034faa2679f6e26740fb3362eebf8cef82d22b2af2a3faaa53bae3c9e14af51cbf64720a7c66431905ca5cc43f978366456cc4e3b7f4a nginx.confd
...
...
This diff is collapsed.
Click to expand it.
main/nginx/nginx.conf
+
0
−
3
View file @
8f85c54b
...
...
@@ -101,6 +101,3 @@ http {
# Includes virtual hosts configs.
include
/etc/nginx/http.d/*.conf
;
}
# TIP: Uncomment if you use stream module.
#include /etc/nginx/stream.conf;
This diff is collapsed.
Click to expand it.
main/nginx/stream.conf
+
1
−
1
View file @
8f85c54b
# /etc/nginx/stream.conf
# /etc/nginx/
conf.d/
stream.conf
stream
{
# Specifies the main log format.
...
...
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