Skip to content

Commit

Permalink
Merge pull request canonical#59 from cjdcordeiro/ubuntu-23.10-nginx
Browse files Browse the repository at this point in the history
feat: Ubuntu 23.10 slices for NGINX
  • Loading branch information
cjdcordeiro authored Sep 26, 2023
2 parents d38a33b + a4aac51 commit e6b7d35
Show file tree
Hide file tree
Showing 18 changed files with 288 additions and 0 deletions.
75 changes: 75 additions & 0 deletions slices/iproute2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
package: iproute2

slices:
# iproute2 is a utility package which typically could be split into
# utility-specific slices. The `bins` slice however brings in all the
# utilities for cases where iproute2 is used as a dependency for another
# package (eg. nginx), where we can't easily know which utilities are
# actually going to be needed.
bins:
# Leaving the debconf dependency out as we don't currently need pkg mgmt.
# Also, debconf is used by the pkg's maintainer scripts, which are handled
# differently in Chisel.
essential:
- iproute2_config
- iproute2_libs
- libcap2-bin_bins
contents:
/bin/ip:
/sbin/ip:
/bin/ss:
/sbin/bridge:
/sbin/dcb:
/sbin/devlink:
/sbin/rtacct:
/sbin/rtmon:
# "tc" is an obvious candidate for getting its own "traffic-control"
# slice in the future, if needed.
/sbin/tc:
/sbin/tipc:
/sbin/vdpa:
/usr/bin/lnstat:
/usr/bin/ctstat:
/usr/bin/rtstat:
/usr/bin/nstat:
/usr/bin/rdma:
/usr/bin/routel:
/usr/sbin/arpd:
/usr/sbin/genl:

config:
# Corresponds to the pkg's conffiles
contents:
/etc/iproute2/bpf_pinning:
/etc/iproute2/ematch_map:
/etc/iproute2/group:
/etc/iproute2/nl_protos:
/etc/iproute2/rt_dsfield:
/etc/iproute2/rt_protos:
/etc/iproute2/rt_protos.d/:
/etc/iproute2/rt_realms:
/etc/iproute2/rt_scopes:
/etc/iproute2/rt_tables:
/etc/iproute2/rt_tables.d/:

libs:
essential:
- libbpf1_libs
- libbsd0_libs
- libc6_libs
- libcap2_libs
- libdb5.3_libs
- libelf1_libs
- libmnl0_libs
- libselinux1_libs
- libtirpc3_libs
- libxtables12_libs
contents:
/usr/include/iproute2/bpf_elf.h:
/usr/lib/*-linux-*/tc/experimental.dist:
/usr/lib/*-linux-*/tc/m_xt.so:
/usr/lib/*-linux-*/tc/m_ipt.so:
/usr/lib/*-linux-*/tc/normal.dist:
/usr/lib/*-linux-*/tc/pareto.dist:
/usr/lib/*-linux-*/tc/paretonormal.dist:
/usr/lib/*-linux-*/tc/q_atm.so:
10 changes: 10 additions & 0 deletions slices/libbpf1.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package: libbpf1

slices:
libs:
essential:
- libc6_libs
- libelf1_libs
- zlib1g_libs
contents:
/usr/lib/*-linux-*/libbpf.so.1*:
9 changes: 9 additions & 0 deletions slices/libbsd0.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package: libbsd0

slices:
libs:
essential:
- libc6_libs
- libmd0_libs
contents:
/usr/lib/*-linux-*/libbsd.so.0*:
12 changes: 12 additions & 0 deletions slices/libcap2-bin.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package: libcap2-bin

slices:
bins:
essential:
- libc6_libs
- libcap2_libs
contents:
/sbin/capsh:
/sbin/getcap:
/sbin/getpcaps:
/sbin/setcap:
10 changes: 10 additions & 0 deletions slices/libcap2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package: libcap2

slices:
libs:
essential:
- libc6_libs
contents:
/lib/*-linux-*/libcap.so.2*:
/lib/*-linux-*/libpsx.so.2*:

8 changes: 8 additions & 0 deletions slices/libdb5.3.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package: libdb5.3

slices:
libs:
essential:
- libc6_libs
contents:
/usr/lib/*-linux-*/libdb-5.3.so:
11 changes: 11 additions & 0 deletions slices/libelf1.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package: libelf1

slices:
libs:
essential:
- libc6_libs
- libzstd1_libs
- zlib1g_libs
contents:
/usr/lib/*-linux-*/libelf-0.*.so:
/usr/lib/*-linux-*/libelf.so.1:
12 changes: 12 additions & 0 deletions slices/libgssapi-krb5-2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package: libgssapi-krb5-2

slices:
libs:
essential:
- libc6_libs
- libcom-err2_libs
- libk5crypto3_libs
- libkrb5-3_libs
- libkrb5support0_libs
contents:
/usr/lib/*-linux-*/libgssapi_krb5.so.2*:
8 changes: 8 additions & 0 deletions slices/libmd0.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package: libmd0

slices:
libs:
essential:
- libc6_libs
contents:
/usr/lib/*-linux-*/libmd.so.0*:
8 changes: 8 additions & 0 deletions slices/libmnl0.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package: libmnl0

slices:
libs:
essential:
- libc6_libs
contents:
/usr/lib/*-linux-*/libmnl.so.0*:
8 changes: 8 additions & 0 deletions slices/libpcre2-8-0.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package: libpcre2-8-0

slices:
libs:
essential:
- libc6_libs
contents:
/usr/lib/*-linux-*/libpcre2-8.so.0*:
9 changes: 9 additions & 0 deletions slices/libselinux1.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package: libselinux1

slices:
libs:
essential:
- libc6_libs
- libpcre2-8-0_libs
contents:
/lib/*-linux-*/libselinux.so.1:
6 changes: 6 additions & 0 deletions slices/libtirpc-common.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package: libtirpc-common

slices:
config:
contents:
/etc/netconfig:
10 changes: 10 additions & 0 deletions slices/libtirpc3.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package: libtirpc3

slices:
libs:
essential:
- libc6_libs
- libgssapi-krb5-2_libs
- libtirpc-common_config
contents:
/lib/*-linux-*/libtirpc.so.3*:
8 changes: 8 additions & 0 deletions slices/libxtables12.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package: libxtables12

slices:
libs:
essential:
- libc6_libs
contents:
/usr/lib/*-linux-*/libxtables.so.12*:
8 changes: 8 additions & 0 deletions slices/libzstd1.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package: libzstd1

slices:
libs:
essential:
- libc6_libs
contents:
/usr/lib/*-linux-*/libzstd.so.1*:
60 changes: 60 additions & 0 deletions slices/nginx-common.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
package: nginx-common

slices:
# Leaving the debconf dependency out as we don't currently need pkg mgmt.
# Also, debconf is especially used for the maintainer scripts, which are
# handled differently in Chisel.
# There's also no need (yet) for any init- and systemd-related files.
config:
contents:
/etc/logrotate.d/nginx:
/etc/nginx/fastcgi.conf:
/etc/nginx/fastcgi_params:
/etc/nginx/koi-utf:
/etc/nginx/koi-win:
/etc/nginx/mime.types:
/etc/nginx/nginx.conf:
/etc/nginx/proxy_params:
/etc/nginx/scgi_params:
/etc/nginx/sites-available/default:
/etc/nginx/snippets/fastcgi-php.conf:
/etc/nginx/snippets/snakeoil.conf:
/etc/nginx/uwsgi_params:
/etc/nginx/win-utf:
# Created by the maintainer scripts
/var/log/nginx/: {make: true, mode: 0755}
/var/log/nginx/access.log: {text: "", mode: 640}
/var/log/nginx/error.log: {text: "", mode: 640}
/etc/nginx/sites-enabled/default: {symlink: /etc/nginx/sites-available/default}
/var/www/html/: {make: true}
/var/lib/nginx/: {make: true}

ufw-config:
contents:
/etc/ufw/applications.d/nginx:

apport:
contents:
/usr/share/apport/package-hooks/source_nginx.py:

index:
contents:
/usr/share/nginx/html/index.html:
/var/www/html/index.nginx-debian.html: {copy: /usr/share/nginx/html/index.html}

modules:
contents:
/usr/share/nginx/modules:

vim-addons:
essential:
- nginx-common_vim-config
contents:
/usr/share/vim/addons/ftdetect/nginx.vim:
/usr/share/vim/addons/ftplugin/nginx.vim:
/usr/share/vim/addons/indent/nginx.vim:
/usr/share/vim/addons/syntax/nginx.vim:

vim-config:
contents:
/usr/share/vim/registry/nginx.yaml:
16 changes: 16 additions & 0 deletions slices/nginx.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package: nginx

slices:
bins:
essential:
# iproute2 seems to only be required for executing the maintainer
# scripts, which is something that is handled differently in Chisel.
# - iproute2_bins
- libc6_libs
- libcrypt1_libs
- libpcre2-8-0_libs
- libssl3_libs
- nginx-common_config
- zlib1g_libs
contents:
/usr/sbin/nginx:

0 comments on commit e6b7d35

Please sign in to comment.