From 58e1b9a0e9117781a97c3d923244bad9d0baf7cd Mon Sep 17 00:00:00 2001 From: Rafid Bin Mostofa Date: Wed, 6 Mar 2024 16:11:04 +0600 Subject: [PATCH 1/4] chore(23.10): add lint job --- .github/workflows/ci.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ec2e29756..9187a7ee1 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -15,3 +15,7 @@ jobs: installability-tests: name: Installability tests uses: canonical/chisel-releases/.github/workflows/install-slices.yaml@main + + lint: + name: Lint + uses: canonical/chisel-releases/.github/workflows/lint.yaml@main From 9b2d3a2a5fa6e22532a4b5e5312b7aeea15e1f02 Mon Sep 17 00:00:00 2001 From: Rafid Bin Mostofa Date: Fri, 8 Mar 2024 09:40:27 +0600 Subject: [PATCH 2/4] refactor: re-indent chisel.yaml with 2 spaces --- chisel.yaml | 76 ++++++++++++++++++++++++++--------------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/chisel.yaml b/chisel.yaml index f734063e8..b7ccc3d7b 100644 --- a/chisel.yaml +++ b/chisel.yaml @@ -1,44 +1,44 @@ format: chisel-v1 archives: - ubuntu: - version: 23.10 - components: [main, universe] - suites: [mantic, mantic-security, mantic-updates] - v1-public-keys: [ubuntu-archive-key-2018] + ubuntu: + version: 23.10 + components: [main, universe] + suites: [mantic, mantic-security, mantic-updates] + v1-public-keys: [ubuntu-archive-key-2018] v1-public-keys: - # Ubuntu Archive Automatic Signing Key (2018) - # rsa4096/f6ecb3762474eda9d21b7022871920d1991bc93c 2018-09-17T15:01:46Z - ubuntu-archive-key-2018: - id: "871920D1991BC93C" - armor: | - -----BEGIN PGP PUBLIC KEY BLOCK----- + # Ubuntu Archive Automatic Signing Key (2018) + # rsa4096/f6ecb3762474eda9d21b7022871920d1991bc93c 2018-09-17T15:01:46Z + ubuntu-archive-key-2018: + id: "871920D1991BC93C" + armor: | + -----BEGIN PGP PUBLIC KEY BLOCK----- - mQINBFufwdoBEADv/Gxytx/LcSXYuM0MwKojbBye81s0G1nEx+lz6VAUpIUZnbkq - dXBHC+dwrGS/CeeLuAjPRLU8AoxE/jjvZVp8xFGEWHYdklqXGZ/gJfP5d3fIUBtZ - HZEJl8B8m9pMHf/AQQdsC+YzizSG5t5Mhnotw044LXtdEEkx2t6Jz0OGrh+5Ioxq - X7pZiq6Cv19BohaUioKMdp7ES6RYfN7ol6HSLFlrMXtVfh/ijpN9j3ZhVGVeRC8k - KHQsJ5PkIbmvxBiUh7SJmfZUx0IQhNMaDHXfdZAGNtnhzzNReb1FqNLSVkrS/Pns - AQzMhG1BDm2VOSF64jebKXffFqM5LXRQTeqTLsjUbbrqR6s/GCO8UF7jfUj6I7ta - LygmsHO/JD4jpKRC0gbpUBfaiJyLvuepx3kWoqL3sN0LhlMI80+fA7GTvoOx4tpq - VlzlE6TajYu+jfW3QpOFS5ewEMdL26hzxsZg/geZvTbArcP+OsJKRmhv4kNo6Ayd - yHQ/3ZV/f3X9mT3/SPLbJaumkgp3Yzd6t5PeBu+ZQk/mN5WNNuaihNEV7llb1Zhv - Y0Fxu9BVd/BNl0rzuxp3rIinB2TX2SCg7wE5xXkwXuQ/2eTDE0v0HlGntkuZjGow - DZkxHZQSxZVOzdZCRVaX/WEFLpKa2AQpw5RJrQ4oZ/OfifXyJzP27o03wQARAQAB - tEJVYnVudHUgQXJjaGl2ZSBBdXRvbWF0aWMgU2lnbmluZyBLZXkgKDIwMTgpIDxm - dHBtYXN0ZXJAdWJ1bnR1LmNvbT6JAjgEEwEKACIFAlufwdoCGwMGCwkIBwMCBhUI - AgkKCwQWAgMBAh4BAheAAAoJEIcZINGZG8k8LHMQAKS2cnxz/5WaoCOWArf5g6UH - beOCgc5DBm0hCuFDZWWv427aGei3CPuLw0DGLCXZdyc5dqE8mvjMlOmmAKKlj1uG - g3TYCbQWjWPeMnBPZbkFgkZoXJ7/6CB7bWRht1sHzpt1LTZ+SYDwOwJ68QRp7DRa - Zl9Y6QiUbeuhq2DUcTofVbBxbhrckN4ZteLvm+/nG9m/ciopc66LwRdkxqfJ32Cy - q+1TS5VaIJDG7DWziG+Kbu6qCDM4QNlg3LH7p14CrRxAbc4lvohRgsV4eQqsIcdF - kuVY5HPPj2K8TqpY6STe8Gh0aprG1RV8ZKay3KSMpnyV1fAKn4fM9byiLzQAovC0 - LZ9MMMsrAS/45AvC3IEKSShjLFn1X1dRCiO6/7jmZEoZtAp53hkf8SMBsi78hVNr - BumZwfIdBA1v22+LY4xQK8q4XCoRcA9G+pvzU9YVW7cRnDZZGl0uwOw7z9PkQBF5 - KFKjWDz4fCk+K6+YtGpovGKekGBb8I7EA6UpvPgqA/QdI0t1IBP0N06RQcs1fUaA - QEtz6DGy5zkRhR4pGSZn+dFET7PdAjEK84y7BdY4t+U1jcSIvBj0F2B7LwRL7xGp - SpIKi/ekAXLs117bvFHaCvmUYN7JVp1GMmVFxhIdx6CFm3fxG8QjNb5tere/YqK+ - uOgcXny1UlwtCUzlrSaP - =9AdM - -----END PGP PUBLIC KEY BLOCK----- + mQINBFufwdoBEADv/Gxytx/LcSXYuM0MwKojbBye81s0G1nEx+lz6VAUpIUZnbkq + dXBHC+dwrGS/CeeLuAjPRLU8AoxE/jjvZVp8xFGEWHYdklqXGZ/gJfP5d3fIUBtZ + HZEJl8B8m9pMHf/AQQdsC+YzizSG5t5Mhnotw044LXtdEEkx2t6Jz0OGrh+5Ioxq + X7pZiq6Cv19BohaUioKMdp7ES6RYfN7ol6HSLFlrMXtVfh/ijpN9j3ZhVGVeRC8k + KHQsJ5PkIbmvxBiUh7SJmfZUx0IQhNMaDHXfdZAGNtnhzzNReb1FqNLSVkrS/Pns + AQzMhG1BDm2VOSF64jebKXffFqM5LXRQTeqTLsjUbbrqR6s/GCO8UF7jfUj6I7ta + LygmsHO/JD4jpKRC0gbpUBfaiJyLvuepx3kWoqL3sN0LhlMI80+fA7GTvoOx4tpq + VlzlE6TajYu+jfW3QpOFS5ewEMdL26hzxsZg/geZvTbArcP+OsJKRmhv4kNo6Ayd + yHQ/3ZV/f3X9mT3/SPLbJaumkgp3Yzd6t5PeBu+ZQk/mN5WNNuaihNEV7llb1Zhv + Y0Fxu9BVd/BNl0rzuxp3rIinB2TX2SCg7wE5xXkwXuQ/2eTDE0v0HlGntkuZjGow + DZkxHZQSxZVOzdZCRVaX/WEFLpKa2AQpw5RJrQ4oZ/OfifXyJzP27o03wQARAQAB + tEJVYnVudHUgQXJjaGl2ZSBBdXRvbWF0aWMgU2lnbmluZyBLZXkgKDIwMTgpIDxm + dHBtYXN0ZXJAdWJ1bnR1LmNvbT6JAjgEEwEKACIFAlufwdoCGwMGCwkIBwMCBhUI + AgkKCwQWAgMBAh4BAheAAAoJEIcZINGZG8k8LHMQAKS2cnxz/5WaoCOWArf5g6UH + beOCgc5DBm0hCuFDZWWv427aGei3CPuLw0DGLCXZdyc5dqE8mvjMlOmmAKKlj1uG + g3TYCbQWjWPeMnBPZbkFgkZoXJ7/6CB7bWRht1sHzpt1LTZ+SYDwOwJ68QRp7DRa + Zl9Y6QiUbeuhq2DUcTofVbBxbhrckN4ZteLvm+/nG9m/ciopc66LwRdkxqfJ32Cy + q+1TS5VaIJDG7DWziG+Kbu6qCDM4QNlg3LH7p14CrRxAbc4lvohRgsV4eQqsIcdF + kuVY5HPPj2K8TqpY6STe8Gh0aprG1RV8ZKay3KSMpnyV1fAKn4fM9byiLzQAovC0 + LZ9MMMsrAS/45AvC3IEKSShjLFn1X1dRCiO6/7jmZEoZtAp53hkf8SMBsi78hVNr + BumZwfIdBA1v22+LY4xQK8q4XCoRcA9G+pvzU9YVW7cRnDZZGl0uwOw7z9PkQBF5 + KFKjWDz4fCk+K6+YtGpovGKekGBb8I7EA6UpvPgqA/QdI0t1IBP0N06RQcs1fUaA + QEtz6DGy5zkRhR4pGSZn+dFET7PdAjEK84y7BdY4t+U1jcSIvBj0F2B7LwRL7xGp + SpIKi/ekAXLs117bvFHaCvmUYN7JVp1GMmVFxhIdx6CFm3fxG8QjNb5tere/YqK+ + uOgcXny1UlwtCUzlrSaP + =9AdM + -----END PGP PUBLIC KEY BLOCK----- From ec1878113ac553f6594f5dc2cf20415338e8709b Mon Sep 17 00:00:00 2001 From: Rafid Bin Mostofa Date: Fri, 8 Mar 2024 09:44:52 +0600 Subject: [PATCH 3/4] refactor: fix yamllint errors --- slices/base-passwd.yaml | 4 ++-- slices/ca-certificates.yaml | 4 +++- slices/findutils.yaml | 2 +- slices/iproute2.yaml | 2 +- slices/libcap2.yaml | 1 - slices/libpsl5.yaml | 4 ++-- slices/nginx-common.yaml | 10 ++++++---- slices/tzdata.yaml | 15 ++++++++------- 8 files changed, 23 insertions(+), 19 deletions(-) diff --git a/slices/base-passwd.yaml b/slices/base-passwd.yaml index 0e6d4e3c4..8ce1735f9 100644 --- a/slices/base-passwd.yaml +++ b/slices/base-passwd.yaml @@ -3,9 +3,9 @@ package: base-passwd slices: data: contents: - /usr/share/base-passwd/group.master: {until: mutate} + /usr/share/base-passwd/group.master: {until: mutate} /usr/share/base-passwd/passwd.master: {until: mutate} - /etc/group: {text: FIXME, mutable: true} + /etc/group: {text: FIXME, mutable: true} /etc/passwd: {text: FIXME, mutable: true} mutate: | gr = content.read("/usr/share/base-passwd/group.master") diff --git a/slices/ca-certificates.yaml b/slices/ca-certificates.yaml index bdd36c7a6..c2e90cb00 100644 --- a/slices/ca-certificates.yaml +++ b/slices/ca-certificates.yaml @@ -8,5 +8,7 @@ slices: /usr/share/ca-certificates/mozilla/*: {until: mutate} mutate: | certs_dir = "/usr/share/ca-certificates/mozilla/" - certs = [content.read(certs_dir + path) for path in content.list(certs_dir)] + certs = [ + content.read(certs_dir + path) for path in content.list(certs_dir) + ] content.write("/etc/ssl/certs/ca-certificates.crt", "".join(certs)) diff --git a/slices/findutils.yaml b/slices/findutils.yaml index e8efa331a..5a176e730 100644 --- a/slices/findutils.yaml +++ b/slices/findutils.yaml @@ -4,7 +4,7 @@ slices: bins: essential: - libc6_libs - - libselinux1_libs + - libselinux1_libs contents: /usr/bin/find: /usr/bin/xargs: diff --git a/slices/iproute2.yaml b/slices/iproute2.yaml index c78344679..b0200667a 100644 --- a/slices/iproute2.yaml +++ b/slices/iproute2.yaml @@ -9,7 +9,7 @@ slices: 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. + # differently in Chisel. essential: - iproute2_config - iproute2_libs diff --git a/slices/libcap2.yaml b/slices/libcap2.yaml index fc1838b8b..d85fc7167 100644 --- a/slices/libcap2.yaml +++ b/slices/libcap2.yaml @@ -7,4 +7,3 @@ slices: contents: /lib/*-linux-*/libcap.so.2*: /lib/*-linux-*/libpsx.so.2*: - diff --git a/slices/libpsl5.yaml b/slices/libpsl5.yaml index 67b85ec2e..ddb1cbf26 100644 --- a/slices/libpsl5.yaml +++ b/slices/libpsl5.yaml @@ -1,5 +1,5 @@ -# Libpsl5 allows checking domains against the Public Suffix List. It can be -# used to avoid privacy-leaking 'super-cookies', 'super domain' certificates, +# Libpsl5 allows checking domains against the Public Suffix List. It can be +# used to avoid privacy-leaking 'super-cookies', 'super domain' certificates, # for domain highlighting purposes sorting domain lists by site and more. package: libpsl5 diff --git a/slices/nginx-common.yaml b/slices/nginx-common.yaml index 83d80bdc9..596c50e53 100644 --- a/slices/nginx-common.yaml +++ b/slices/nginx-common.yaml @@ -23,9 +23,10 @@ slices: /etc/nginx/win-utf: # Created by the maintainer scripts /var/log/nginx/: {make: true, mode: 0755} - /var/log/nginx/access.log: {text: "", mode: 0640} + /var/log/nginx/access.log: {text: "", mode: 0640} /var/log/nginx/error.log: {text: "", mode: 0640} - /etc/nginx/sites-enabled/default: {symlink: /etc/nginx/sites-available/default} + /etc/nginx/sites-enabled/default: + symlink: /etc/nginx/sites-available/default /var/www/html/: {make: true} /var/lib/nginx/: {make: true} @@ -40,7 +41,8 @@ slices: index: contents: /usr/share/nginx/html/index.html: - /var/www/html/index.nginx-debian.html: {copy: /usr/share/nginx/html/index.html} + /var/www/html/index.nginx-debian.html: + copy: /usr/share/nginx/html/index.html modules: contents: @@ -54,7 +56,7 @@ slices: /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: diff --git a/slices/tzdata.yaml b/slices/tzdata.yaml index 76ef9e25f..4347e118c 100644 --- a/slices/tzdata.yaml +++ b/slices/tzdata.yaml @@ -1,9 +1,10 @@ package: tzdata slices: - # The "base" slice contains Canonical timezone abbreviations. These are primary, - # preferred zone names that are often used as abbreviations for location-specific - # timezones across the globe. Example: Europe/Sofia observes EET. + # The "base" slice contains Canonical timezone abbreviations. These are + # primary, preferred zone names that are often used as abbreviations for + # location-specific timezones across the globe. Example: Europe/Sofia + # observes EET. base: contents: /usr/share/zoneinfo/CET: @@ -70,10 +71,10 @@ slices: /usr/share/zoneinfo/zone.tab: /usr/share/zoneinfo/zone1970.tab: - # "Etc" is meant to provide "timezones" that don't fit with the standard timezones. - # As an example, UTC isn't actually a timezone, but a standard. Like Zulu and others, - # most of these can be used for time information, but derive from different domains - # (like the military). Same for others. + # "Etc" is meant to provide "timezones" that don't fit with the standard + # timezones. As an example, UTC isn't actually a timezone, but a standard. + # Like Zulu and others, most of these can be used for time information, but + # derive from different domains (like the military). Same for others. etc: contents: /usr/share/zoneinfo/Etc/**: From 4713bef0a13c83a113c47d66ecd409979b2c9a41 Mon Sep 17 00:00:00 2001 From: Rafid Bin Mostofa Date: Fri, 8 Mar 2024 09:56:36 +0600 Subject: [PATCH 4/4] refactor: sort 'essential' and 'contents' This commit sorts the .essential list and .contents map entries in lexicographical order. --- slices/base-files.yaml | 6 +++--- slices/base-passwd.yaml | 4 ++-- slices/bash.yaml | 2 +- slices/dotnet-hostfxr-6.0.yaml | 2 +- slices/iproute2.yaml | 8 ++++---- slices/libc6.yaml | 2 +- slices/libpython3.11-stdlib.yaml | 4 ++-- slices/libunwind-13.yaml | 6 +++--- slices/libunwind8.yaml | 2 +- slices/nginx-common.yaml | 9 +++++---- slices/openssl.yaml | 2 +- slices/python3.11.yaml | 2 +- slices/tzdata.yaml | 10 +++++----- 13 files changed, 30 insertions(+), 29 deletions(-) diff --git a/slices/base-files.yaml b/slices/base-files.yaml index 054d5a709..a916459f3 100644 --- a/slices/base-files.yaml +++ b/slices/base-files.yaml @@ -3,12 +3,12 @@ package: base-files slices: base: essential: - - base-files_etc - base-files_bin + - base-files_etc + - base-files_home - base-files_lib - base-files_tmp - base-files_var - - base-files_home etc: contents: @@ -52,8 +52,8 @@ slices: contents: /etc/debian_version: /etc/dpkg/origins/debian: - /etc/dpkg/origins/ubuntu: /etc/dpkg/origins/default: {symlink: /etc/dpkg/origins/ubuntu} + /etc/dpkg/origins/ubuntu: /etc/host.conf: /etc/issue: /etc/issue.net: diff --git a/slices/base-passwd.yaml b/slices/base-passwd.yaml index 8ce1735f9..cadc1f904 100644 --- a/slices/base-passwd.yaml +++ b/slices/base-passwd.yaml @@ -3,10 +3,10 @@ package: base-passwd slices: data: contents: - /usr/share/base-passwd/group.master: {until: mutate} - /usr/share/base-passwd/passwd.master: {until: mutate} /etc/group: {text: FIXME, mutable: true} /etc/passwd: {text: FIXME, mutable: true} + /usr/share/base-passwd/group.master: {until: mutate} + /usr/share/base-passwd/passwd.master: {until: mutate} mutate: | gr = content.read("/usr/share/base-passwd/group.master") content.write("/etc/group", gr) diff --git a/slices/bash.yaml b/slices/bash.yaml index e0f3b4aac..beeba890a 100644 --- a/slices/bash.yaml +++ b/slices/bash.yaml @@ -17,5 +17,5 @@ slices: # user should manually link /bin/sh to /bin/bash /bin/bash: /bin/rbash: - /usr/bin/clear_console: /usr/bin/bashbug: + /usr/bin/clear_console: diff --git a/slices/dotnet-hostfxr-6.0.yaml b/slices/dotnet-hostfxr-6.0.yaml index 979a75bf6..17262b7c3 100644 --- a/slices/dotnet-hostfxr-6.0.yaml +++ b/slices/dotnet-hostfxr-6.0.yaml @@ -3,9 +3,9 @@ package: dotnet-hostfxr-6.0 slices: libs: essential: + - dotnet-host_bins - libc6_libs - libgcc-s1_libs - libstdc++6_libs - - dotnet-host_bins contents: /usr/lib/dotnet/host/fxr/*/libhostfxr.so: diff --git a/slices/iproute2.yaml b/slices/iproute2.yaml index b0200667a..3b7c34d10 100644 --- a/slices/iproute2.yaml +++ b/slices/iproute2.yaml @@ -16,11 +16,11 @@ slices: - libcap2-bin_bins contents: /bin/ip: - /sbin/ip: /bin/ss: /sbin/bridge: /sbin/dcb: /sbin/devlink: + /sbin/ip: /sbin/rtacct: /sbin/rtmon: # "tc" is an obvious candidate for getting its own "traffic-control" @@ -28,12 +28,12 @@ slices: /sbin/tc: /sbin/tipc: /sbin/vdpa: - /usr/bin/lnstat: /usr/bin/ctstat: - /usr/bin/rtstat: + /usr/bin/lnstat: /usr/bin/nstat: /usr/bin/rdma: /usr/bin/routel: + /usr/bin/rtstat: /usr/sbin/arpd: /usr/sbin/genl: @@ -67,8 +67,8 @@ slices: 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/m_xt.so: /usr/lib/*-linux-*/tc/normal.dist: /usr/lib/*-linux-*/tc/pareto.dist: /usr/lib/*-linux-*/tc/paretonormal.dist: diff --git a/slices/libc6.yaml b/slices/libc6.yaml index 49c5c40a6..cd48a47f5 100644 --- a/slices/libc6.yaml +++ b/slices/libc6.yaml @@ -7,6 +7,7 @@ slices: libs: contents: + /lib*/ld*.so.*: /lib/*-linux-*/ld*.so.*: /lib/*-linux-*/libBrokenLocale.so.*: /lib/*-linux-*/libanl.so.*: @@ -27,4 +28,3 @@ slices: /lib/*-linux-*/librt.so.*: /lib/*-linux-*/libthread_db.so.*: /lib/*-linux-*/libutil.so.*: - /lib*/ld*.so.*: diff --git a/slices/libpython3.11-stdlib.yaml b/slices/libpython3.11-stdlib.yaml index 3903e3d80..c5cf12e05 100644 --- a/slices/libpython3.11-stdlib.yaml +++ b/slices/libpython3.11-stdlib.yaml @@ -173,8 +173,8 @@ slices: /usr/lib/python3.11/lib-dynload/_testmultiphase.cpython-311-*-linux-*.so: /usr/lib/python3.11/lib-dynload/_xxsubinterpreters.cpython-311-*-linux-*.so: /usr/lib/python3.11/lib-dynload/_xxtestfuzz.cpython-311-*-linux-*.so: - /usr/lib/python3.11/lib-dynload/xxlimited_35.cpython-311-*-linux-*.so: /usr/lib/python3.11/lib-dynload/xxlimited.cpython-311-*-linux-*.so: + /usr/lib/python3.11/lib-dynload/xxlimited_35.cpython-311-*-linux-*.so: /usr/lib/python3.11/test/**: /usr/lib/python3.11/unittest/**: @@ -349,8 +349,8 @@ slices: essential: - libpython3.11-stdlib_core contents: - /usr/lib/python3.11/pydoc_data/**: /usr/lib/python3.11/pydoc.py: + /usr/lib/python3.11/pydoc_data/**: # Text Processing Services # https://docs.python.org/3.11/library/text.html diff --git a/slices/libunwind-13.yaml b/slices/libunwind-13.yaml index c197fadbd..bda66b9c3 100644 --- a/slices/libunwind-13.yaml +++ b/slices/libunwind-13.yaml @@ -5,7 +5,7 @@ slices: essential: - libc6_libs contents: - /usr/lib/llvm-13/lib/libunwind.so.1.*: - /usr/lib/llvm-13/lib/libunwind.so.1: - /usr/lib/*-linux-*/libunwind.so.1.*: /usr/lib/*-linux-*/libunwind.so.1: + /usr/lib/*-linux-*/libunwind.so.1.*: + /usr/lib/llvm-13/lib/libunwind.so.1: + /usr/lib/llvm-13/lib/libunwind.so.1.*: diff --git a/slices/libunwind8.yaml b/slices/libunwind8.yaml index 2cae756f7..e1cc21b11 100644 --- a/slices/libunwind8.yaml +++ b/slices/libunwind8.yaml @@ -6,5 +6,5 @@ slices: - liblzma5_libs contents: /usr/lib/*-linux-*/libunwind-*.so.*: - /usr/lib/*-linux-*/libunwind.so.8.*: /usr/lib/*-linux-*/libunwind.so.8: + /usr/lib/*-linux-*/libunwind.so.8.*: diff --git a/slices/nginx-common.yaml b/slices/nginx-common.yaml index 596c50e53..cc77dbe58 100644 --- a/slices/nginx-common.yaml +++ b/slices/nginx-common.yaml @@ -17,18 +17,19 @@ slices: /etc/nginx/proxy_params: /etc/nginx/scgi_params: /etc/nginx/sites-available/default: + # This symlink is created by the maintainer scipts + /etc/nginx/sites-enabled/default: + symlink: /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 + # Following are created by the maintainer scripts + /var/lib/nginx/: {make: true} /var/log/nginx/: {make: true, mode: 0755} /var/log/nginx/access.log: {text: "", mode: 0640} /var/log/nginx/error.log: {text: "", mode: 0640} - /etc/nginx/sites-enabled/default: - symlink: /etc/nginx/sites-available/default /var/www/html/: {make: true} - /var/lib/nginx/: {make: true} ufw-config: contents: diff --git a/slices/openssl.yaml b/slices/openssl.yaml index 7a9cb1b60..9899cef5d 100644 --- a/slices/openssl.yaml +++ b/slices/openssl.yaml @@ -3,8 +3,8 @@ package: openssl slices: bins: essential: - - libc6_libs - libc6_config + - libc6_libs - libssl3_libs - openssl_config - openssl_data diff --git a/slices/python3.11.yaml b/slices/python3.11.yaml index da9b597ac..54459d28b 100644 --- a/slices/python3.11.yaml +++ b/slices/python3.11.yaml @@ -5,9 +5,9 @@ slices: # It includes very few modules from the libpython3.11-stdlib package. core: essential: - - python3.11-minimal_bins - libpython3.11-stdlib_core - media-types_data + - python3.11-minimal_bins # The "standard" slice extends "core" with all the Python # modules from the libpython3.11-stdlib package. diff --git a/slices/tzdata.yaml b/slices/tzdata.yaml index 4347e118c..bef4202f9 100644 --- a/slices/tzdata.yaml +++ b/slices/tzdata.yaml @@ -14,16 +14,16 @@ slices: /usr/share/zoneinfo/EST5EDT: /usr/share/zoneinfo/Factory: /usr/share/zoneinfo/HST: - /usr/share/zoneinfo/iso3166.tab: - /usr/share/zoneinfo/leap-seconds.list: - /usr/share/zoneinfo/leapseconds: - /usr/share/zoneinfo/localtime: /usr/share/zoneinfo/MET: /usr/share/zoneinfo/MST: /usr/share/zoneinfo/MST7MDT: /usr/share/zoneinfo/PST8PDT: - /usr/share/zoneinfo/tzdata.zi: /usr/share/zoneinfo/WET: + /usr/share/zoneinfo/iso3166.tab: + /usr/share/zoneinfo/leap-seconds.list: + /usr/share/zoneinfo/leapseconds: + /usr/share/zoneinfo/localtime: + /usr/share/zoneinfo/tzdata.zi: africa: essential: