main/nginx: add new package for nginx-mod-http-geoip2#6762
main/nginx: add new package for nginx-mod-http-geoip2#6762aptalca wants to merge 1 commit intoalpinelinux:masterfrom aptalca:nginx-mod-http-geoip2
Conversation
maxwell-k
left a comment
There was a problem hiding this comment.
These changes overall look good.
My only request is to please squash the two commits into one. The first line of the combined commit message should mention the repository and package, perhaps for example:
main/nginx: add http-geoip2 module
For more details about squashing commits please see https://github.com/alpinelinux/aports/blob/master/.github/CONTRIBUTING.md#clean-up-a-pull-request-pr
|
@maxwell-k thanks, commits squashed as requested |
|
@aptalca: that's great thank you, at the moment our Drone CI is failing. If you please rebase that commit on the current master the CI should pass. The Drone config has changed recently and it now applies a PR differently, the current approach is at: Thanks for your help. |
|
@maxwell-k thanks for the heads up and the pointers. All tests are successful now. |
main/nginx/APKBUILD
Outdated
| _add_module "http-vod" "1.24" "https://github.com/kaltura/nginx-vod-module" | ||
|
|
||
| _add_module "http-geoip2" "3.2" "https://github.com/leev/ngx_http_geoip2_module" | ||
| _http_geoip2_depends="libmaxminddb" |
There was a problem hiding this comment.
Why are you depending on libmaxmindb?
abuild will automatically scan elf files for dependencies.
There was a problem hiding this comment.
I was not aware of that. I noticed the other module packages listing their dependencies, so added the dependency here. If it's not needed, I can remove and squash/rebase. Please confirm.
There was a problem hiding this comment.
FYR, you can try to build it with abuild -rK (dont forget to cleanup build deps afterwards) and check the contents of
pkg/.control.$subpkgname/.PKGINFO
pkg/.control.nginx-mod-http-geoip2/.PKGINFO
This should already include the depends to libmaxinddb.
Explicit depends on libs is not needed in normal cases.
There was a problem hiding this comment.
@clandmeter
Yup, you're right. I locally built the package without the dependency listed and .PKGINFO lists the libmaxminddb.so and installing the package also installs libmaxminddb.
However, digging through the PKGINFO files, I realized that libmaxminddb is now also "auto detected" as a dependency for the main nginx package. No idea how that happened. libmaxminddb-dev is installed as a build dependency and the module is supposed to be built as a dynamic module, same as the geoip-dev package that is installed as a build dependency for the geoip1 module
There was a problem hiding this comment.
checkpkg says that the main package gets:
+usr/lib/nginx/modules/ngx_stream_geoip2_module.soSo the automatic package split is not moving all modules to the subpackage. The above file that is left in the main package is introducing the dependency to libmaxminddb.so.
There was a problem hiding this comment.
@fabled thanks so much for pointing me in the right direction. I'll get that figured out shortly
|
Merged in ff3a47c by @jirutka. Thanks for your contribution! (This pull request has been closed automatically by GitHub PR Closer. If you think that it’s not resolved yet, please add a comment.) |
|
Hello, thanks for adding this package, just wondering if there is anything wrong that I can't simply use it? Got no such problem with |
This PR creates a new package for nginx-mod-http-geoip2 that has a dependency on package
libmaxminddb.Nginx is also compiled with support for the dynamic module.
The package source is https://github.com/leev/ngx_http_geoip2_module