diff --git a/slices/geoip-bin.yaml b/slices/geoip-bin.yaml new file mode 100644 index 00000000..baa3cc70 --- /dev/null +++ b/slices/geoip-bin.yaml @@ -0,0 +1,17 @@ +package: geoip-bin + +essential: + - geoip-bin_copyright + +slices: + bins: + essential: + - libc6_libs + - libgeoip1t64_libs + contents: + /usr/bin/geoiplookup: + /usr/bin/geoiplookup6: + + copyright: + contents: + /usr/share/doc/geoip-bin/copyright: diff --git a/slices/geoip-database.yaml b/slices/geoip-database.yaml new file mode 100644 index 00000000..033fe99d --- /dev/null +++ b/slices/geoip-database.yaml @@ -0,0 +1,14 @@ +package: geoip-database + +essential: + - geoip-database_copyright + +slices: + data: + contents: + /usr/share/GeoIP/GeoIP.dat: + /usr/share/GeoIP/GeoIPv6.dat: + + copyright: + contents: + /usr/share/doc/geoip-database/copyright: diff --git a/slices/geoipupdate.yaml b/slices/geoipupdate.yaml new file mode 100644 index 00000000..f20edcda --- /dev/null +++ b/slices/geoipupdate.yaml @@ -0,0 +1,26 @@ +package: geoipupdate + +essential: + - geoipupdate_copyright + +slices: + bins: + essential: + - ca-certificates_data + - geoipupdate_config + - libc6_libs + contents: + /usr/bin/geoipupdate: + + config: + contents: + /etc/GeoIP.conf: + + services: + contents: + /usr/lib/systemd/system/geoipupdate.service: + /usr/lib/systemd/system/geoipupdate.timer: + + copyright: + contents: + /usr/share/doc/geoipupdate/copyright: diff --git a/slices/libgeoip1t64.yaml b/slices/libgeoip1t64.yaml new file mode 100644 index 00000000..abff028b --- /dev/null +++ b/slices/libgeoip1t64.yaml @@ -0,0 +1,15 @@ +package: libgeoip1t64 + +essential: + - libgeoip1t64_copyright + +slices: + libs: + essential: + - libc6_libs + contents: + /usr/lib/*-linux-*/libGeoIP.so.1*: + + copyright: + contents: + /usr/share/doc/libgeoip1t64/copyright: diff --git a/slices/libmaxminddb0.yaml b/slices/libmaxminddb0.yaml new file mode 100644 index 00000000..fdb6a655 --- /dev/null +++ b/slices/libmaxminddb0.yaml @@ -0,0 +1,15 @@ +package: libmaxminddb0 + +essential: + - libmaxminddb0_copyright + +slices: + libs: + essential: + - libc6_libs + contents: + /usr/lib/*-linux-*/libmaxminddb.so.0*: + + copyright: + contents: + /usr/share/doc/libmaxminddb0/copyright: diff --git a/slices/libnginx-mod-http-geoip.yaml b/slices/libnginx-mod-http-geoip.yaml new file mode 100644 index 00000000..1948e495 --- /dev/null +++ b/slices/libnginx-mod-http-geoip.yaml @@ -0,0 +1,27 @@ +package: libnginx-mod-http-geoip + +essential: + - libnginx-mod-http-geoip_copyright + +slices: + modules: + essential: + # libnginx-mod-http-geoip depends on nginx-abi, which is a virtual + # package provided by nginx, hence the dependency on nginx_bins. + - libc6_libs + - libgeoip1t64_libs + - libnginx-mod-http-geoip_config + - nginx_bins + contents: + /usr/lib/nginx/modules/ngx_http_geoip_module.so: + + config: + contents: + # This symlink is created by the maintainer scipts + /etc/nginx/modules-enabled/50-mod-http-geoip.conf: + symlink: /usr/share/nginx/modules-available/mod-http-geoip.conf + /usr/share/nginx/modules-available/mod-http-geoip.conf: + + copyright: + contents: + /usr/share/doc/libnginx-mod-http-geoip/copyright: diff --git a/slices/libnginx-mod-http-geoip2.yaml b/slices/libnginx-mod-http-geoip2.yaml new file mode 100644 index 00000000..01a49337 --- /dev/null +++ b/slices/libnginx-mod-http-geoip2.yaml @@ -0,0 +1,28 @@ +package: libnginx-mod-http-geoip2 + +essential: + - libnginx-mod-http-geoip2_copyright + +slices: + modules: + essential: + # libnginx-mod-http-geoip2 depends on nginx-abi, which is a virtual + # package provided by nginx, hence the dependency on nginx_bins. + - libc6_libs + - libmaxminddb0_libs + - libnginx-mod-http-geoip2_config + - libnginx-mod-stream_modules + - nginx_bins + contents: + /usr/lib/nginx/modules/ngx_http_geoip2_module.so: + + config: + contents: + # This symlink is created by the maintainer scipts + /etc/nginx/modules-enabled/50-mod-http-geoip2.conf: + symlink: /usr/share/nginx/modules-available/mod-http-geoip2.conf + /usr/share/nginx/modules-available/mod-http-geoip2.conf: + + copyright: + contents: + /usr/share/doc/libnginx-mod-http-geoip2/copyright: diff --git a/slices/libnginx-mod-stream-geoip.yaml b/slices/libnginx-mod-stream-geoip.yaml new file mode 100644 index 00000000..9f69f2f5 --- /dev/null +++ b/slices/libnginx-mod-stream-geoip.yaml @@ -0,0 +1,28 @@ +package: libnginx-mod-stream-geoip + +essential: + - libnginx-mod-stream-geoip_copyright + +slices: + modules: + essential: + # libnginx-mod-stream-geoip depends on nginx-abi, which is a virtual + # package provided by nginx, hence the dependency on nginx_bins. + - libc6_libs + - libgeoip1t64_libs + - libnginx-mod-stream-geoip_config + - libnginx-mod-stream_modules + - nginx_bins + contents: + /usr/lib/nginx/modules/ngx_stream_geoip_module.so: + + config: + contents: + # This symlink is created by the maintainer scipts + /etc/nginx/modules-enabled/70-mod-stream-geoip.conf: + symlink: /usr/share/nginx/modules-available/mod-stream-geoip.conf + /usr/share/nginx/modules-available/mod-stream-geoip.conf: + + copyright: + contents: + /usr/share/doc/libnginx-mod-stream-geoip/copyright: diff --git a/slices/libnginx-mod-stream-geoip2.yaml b/slices/libnginx-mod-stream-geoip2.yaml new file mode 100644 index 00000000..b286c7e4 --- /dev/null +++ b/slices/libnginx-mod-stream-geoip2.yaml @@ -0,0 +1,28 @@ +package: libnginx-mod-stream-geoip2 + +essential: + - libnginx-mod-stream-geoip2_copyright + +slices: + modules: + essential: + # libnginx-mod-stream-geoip2 depends on nginx-abi, which is a virtual + # package provided by nginx, hence the dependency on nginx_bins. + - libc6_libs + - libmaxminddb0_libs + - libnginx-mod-stream-geoip2_config + - libnginx-mod-stream_modules + - nginx_bins + contents: + /usr/lib/nginx/modules/ngx_stream_geoip2_module.so: + + config: + contents: + # This symlink is created by the maintainer scipts + /etc/nginx/modules-enabled/70-mod-stream-geoip2.conf: + symlink: /usr/share/nginx/modules-available/mod-stream-geoip2.conf + /usr/share/nginx/modules-available/mod-stream-geoip2.conf: + + copyright: + contents: + /usr/share/doc/libnginx-mod-stream-geoip2/copyright: diff --git a/slices/libnginx-mod-stream.yaml b/slices/libnginx-mod-stream.yaml new file mode 100644 index 00000000..a1dbe459 --- /dev/null +++ b/slices/libnginx-mod-stream.yaml @@ -0,0 +1,26 @@ +package: libnginx-mod-stream + +essential: + - libnginx-mod-stream_copyright + +slices: + modules: + essential: + # libnginx-mod-stream depends on nginx-abi, which is a virtual package + # provided by nginx, hence the dependency on nginx_bins. + - libc6_libs + - libnginx-mod-stream_config + - nginx_bins + contents: + /usr/lib/nginx/modules/ngx_stream_module.so: + + config: + contents: + # This symlink is created by the maintainer scipts + /etc/nginx/modules-enabled/50-mod-stream.conf: + symlink: /usr/share/nginx/modules-available/mod-stream.conf + /usr/share/nginx/modules-available/mod-stream.conf: + + copyright: + contents: + /usr/share/doc/libnginx-mod-stream/copyright: diff --git a/slices/mmdb-bin.yaml b/slices/mmdb-bin.yaml new file mode 100644 index 00000000..67fe30d4 --- /dev/null +++ b/slices/mmdb-bin.yaml @@ -0,0 +1,16 @@ +package: mmdb-bin + +essential: + - mmdb-bin_copyright + +slices: + bins: + essential: + - libc6_libs + - libmaxminddb0_libs + contents: + /usr/bin/mmdblookup: + + copyright: + contents: + /usr/share/doc/mmdb-bin/copyright: diff --git a/slices/nginx.yaml b/slices/nginx.yaml index 7d148250..2399e0a5 100644 --- a/slices/nginx.yaml +++ b/slices/nginx.yaml @@ -14,6 +14,7 @@ slices: - libpcre2-8-0_libs - libssl3t64_libs - nginx-common_config + - nginx-common_modules - zlib1g_libs contents: /usr/sbin/nginx: diff --git a/tests/spread/integration/geoip-bin/task.yaml b/tests/spread/integration/geoip-bin/task.yaml new file mode 100644 index 00000000..43fbffe6 --- /dev/null +++ b/tests/spread/integration/geoip-bin/task.yaml @@ -0,0 +1,9 @@ +summary: Integration tests for geoip-bin + +execute: | + # Chisel a minimum number of slices to give us a runnable system that we can + # test in. + rootfs="$(install-slices geoip-bin_bins)" + + chroot "${rootfs}/" geoiplookup -h + chroot "${rootfs}/" geoiplookup6 -h diff --git a/tests/spread/integration/geoipupdate/task.yaml b/tests/spread/integration/geoipupdate/task.yaml new file mode 100644 index 00000000..2d8cce6d --- /dev/null +++ b/tests/spread/integration/geoipupdate/task.yaml @@ -0,0 +1,8 @@ +summary: Integration tests for geoipupdate + +execute: | + # Chisel a minimum number of slices to give us a runnable system that we can + # test in. + rootfs="$(install-slices geoipupdate_bins)" + + chroot "${rootfs}/" geoipupdate -V diff --git a/tests/spread/integration/libnginx-mod-http-geoip/task.yaml b/tests/spread/integration/libnginx-mod-http-geoip/task.yaml new file mode 100644 index 00000000..fd7f38c2 --- /dev/null +++ b/tests/spread/integration/libnginx-mod-http-geoip/task.yaml @@ -0,0 +1,9 @@ +summary: Integration tests for libnginx-mod-http-geoip + +execute: | + # Chisel a minimum number of slices to give us a runnable system that we can + # test in. + rootfs="$(install-slices base-files_var base-passwd_data libnginx-mod-http-geoip_modules)" + + # This will fail if loading of the NGINX module fails. + chroot "${rootfs}/" nginx -t diff --git a/tests/spread/integration/libnginx-mod-http-geoip2/task.yaml b/tests/spread/integration/libnginx-mod-http-geoip2/task.yaml new file mode 100644 index 00000000..19f9ea2f --- /dev/null +++ b/tests/spread/integration/libnginx-mod-http-geoip2/task.yaml @@ -0,0 +1,9 @@ +summary: Integration tests for libnginx-mod-http-geoip2 + +execute: | + # Chisel a minimum number of slices to give us a runnable system that we can + # test in. + rootfs="$(install-slices base-files_var base-passwd_data libnginx-mod-http-geoip2_modules)" + + # This will fail if loading of the NGINX module fails. + chroot "${rootfs}/" nginx -t diff --git a/tests/spread/integration/libnginx-mod-stream-geoip/task.yaml b/tests/spread/integration/libnginx-mod-stream-geoip/task.yaml new file mode 100644 index 00000000..a53c3952 --- /dev/null +++ b/tests/spread/integration/libnginx-mod-stream-geoip/task.yaml @@ -0,0 +1,9 @@ +summary: Integration tests for libnginx-mod-stream-geoip + +execute: | + # Chisel a minimum number of slices to give us a runnable system that we can + # test in. + rootfs="$(install-slices base-files_var base-passwd_data libnginx-mod-stream-geoip_modules)" + + # This will fail if loading of the NGINX module fails. + chroot "${rootfs}/" nginx -t diff --git a/tests/spread/integration/libnginx-mod-stream-geoip2/task.yaml b/tests/spread/integration/libnginx-mod-stream-geoip2/task.yaml new file mode 100644 index 00000000..5c0c6c48 --- /dev/null +++ b/tests/spread/integration/libnginx-mod-stream-geoip2/task.yaml @@ -0,0 +1,9 @@ +summary: Integration tests for libnginx-mod-stream-geoip2 + +execute: | + # Chisel a minimum number of slices to give us a runnable system that we can + # test in. + rootfs="$(install-slices base-files_var base-passwd_data libnginx-mod-stream-geoip2_modules)" + + # This will fail if loading of the NGINX module fails. + chroot "${rootfs}/" nginx -t diff --git a/tests/spread/integration/libnginx-mod-stream/task.yaml b/tests/spread/integration/libnginx-mod-stream/task.yaml new file mode 100644 index 00000000..ea5e8a2d --- /dev/null +++ b/tests/spread/integration/libnginx-mod-stream/task.yaml @@ -0,0 +1,9 @@ +summary: Integration tests for libnginx-mod-stream + +execute: | + # Chisel a minimum number of slices to give us a runnable system that we can + # test in. + rootfs="$(install-slices base-files_var base-passwd_data libnginx-mod-stream_modules)" + + # This will fail if loading of the NGINX module fails. + chroot "${rootfs}/" nginx -t diff --git a/tests/spread/integration/mmdb-bin/task.yaml b/tests/spread/integration/mmdb-bin/task.yaml new file mode 100644 index 00000000..682de0ef --- /dev/null +++ b/tests/spread/integration/mmdb-bin/task.yaml @@ -0,0 +1,8 @@ +summary: Integration tests for mmdb-bin + +execute: | + # Chisel a minimum number of slices to give us a runnable system that we can + # test in. + rootfs="$(install-slices mmdb-bin_bins)" + + chroot "${rootfs}/" mmdblookup --version