Skip to content

Commit

Permalink
Merge branch 'ubuntu-24.04' into feat/pro/24.04
Browse files Browse the repository at this point in the history
  • Loading branch information
cjdcordeiro authored Dec 17, 2024
2 parents 295fd90 + af12f84 commit 062940e
Show file tree
Hide file tree
Showing 26 changed files with 1,130 additions and 9 deletions.
13 changes: 13 additions & 0 deletions slices/gosu.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package: gosu

essential:
- gosu_copyright

slices:
bins:
contents:
/usr/sbin/gosu:

copyright:
contents:
/usr/share/doc/gosu/copyright:
16 changes: 16 additions & 0 deletions slices/libhwloc15.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package: libhwloc15

essential:
- libhwloc15_copyright

slices:
libs:
essential:
- libc6_libs
- libudev1_libs
contents:
/usr/lib/*-linux-*/libhwloc.so.15*:

copyright:
contents:
/usr/share/doc/libhwloc15/copyright:
17 changes: 17 additions & 0 deletions slices/libjemalloc2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package: libjemalloc2

essential:
- libjemalloc2_copyright

slices:
libs:
essential:
- libc6_libs
- libgcc-s1_libs
- libstdc++6_libs
contents:
/usr/lib/*-linux-*/libjemalloc.so.2:

copyright:
contents:
/usr/share/doc/libjemalloc2/copyright:
15 changes: 15 additions & 0 deletions slices/liblzf1.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package: liblzf1

essential:
- liblzf1_copyright

slices:
libs:
essential:
- libc6_libs
contents:
/usr/lib/*-linux-*/liblzf.so.1*:

copyright:
contents:
/usr/share/doc/liblzf1/copyright:
8 changes: 8 additions & 0 deletions slices/libncursesw6.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package: libncursesw6

essential:
- libncursesw6_copyright

slices:
libs:
essential:
Expand All @@ -10,3 +13,8 @@ slices:
/usr/lib/*-linux-*/libmenuw.so.6*:
/usr/lib/*-linux-*/libncursesw.so.6*:
/usr/lib/*-linux-*/libpanelw.so.6*:
copyright:
essential:
- libtinfo6_copyright
contents:
/usr/share/doc/libncursesw6:
19 changes: 19 additions & 0 deletions slices/libtbb12.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package: libtbb12

essential:
- libtbb12_copyright

slices:
libs:
essential:
- libc6_libs
- libgcc-s1_libs
- libstdc++6_libs
- libtbbbind-2-5_libs
- libtbbmalloc2_libs
contents:
/usr/lib/*-linux-*/libtbb.so.12*:

copyright:
contents:
/usr/share/doc/libtbb12/copyright:
18 changes: 18 additions & 0 deletions slices/libtbbbind-2-5.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package: libtbbbind-2-5

essential:
- libtbbbind-2-5_copyright

slices:
libs:
essential:
- libc6_libs
- libgcc-s1_libs
- libhwloc15_libs
- libstdc++6_libs
contents:
/usr/lib/*-linux-*/libtbbbind_2_5.so.3*:

copyright:
contents:
/usr/share/doc/libtbbbind-2-5/copyright:
18 changes: 18 additions & 0 deletions slices/libtbbmalloc2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package: libtbbmalloc2

essential:
- libtbbmalloc2_copyright

slices:
libs:
essential:
- libc6_libs
- libgcc-s1_libs
- libstdc++6_libs
contents:
/usr/lib/*-linux-*/libtbbmalloc.so.2*:
/usr/lib/*-linux-*/libtbbmalloc_proxy.so.2*:

copyright:
contents:
/usr/share/doc/libtbbmalloc2/copyright:
70 changes: 70 additions & 0 deletions slices/nginx-common.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
package: nginx-common

essential:
- nginx-common_copyright

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:
# 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:
# 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}
/var/www/html/: {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:

copyright:
contents:
/usr/share/doc/nginx-common/copyright:
23 changes: 23 additions & 0 deletions slices/nginx.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package: nginx

essential:
- nginx_copyright

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
- libssl3t64_libs
- nginx-common_config
- zlib1g_libs
contents:
/usr/sbin/nginx:

copyright:
contents:
/usr/share/doc/nginx/copyright:
26 changes: 26 additions & 0 deletions slices/python3-pip.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package: python3-pip

essential:
- python3-pip_copyright

slices:
bins:
essential:
- python3-pip_libs
contents:
/usr/bin/pip:
/usr/bin/pip3:

libs:
essential:
- ca-certificates_data
- python3-setuptools_libs
- python3-wheel_libs
- python3_standard
contents:
/usr/lib/python3/dist-packages/pip-*.dist-info/**:
/usr/lib/python3/dist-packages/pip/**:

copyright:
contents:
/usr/share/doc/python3-pip/copyright:
15 changes: 15 additions & 0 deletions slices/python3-pkg-resources.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package: python3-pkg-resources

essential:
- python3-pkg-resources_copyright

slices:
libs:
essential:
- python3_standard
contents:
/usr/lib/python3/dist-packages/pkg_resources/**:

copyright:
contents:
/usr/share/doc/python3-pkg-resources/copyright:
18 changes: 18 additions & 0 deletions slices/python3-setuptools.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package: python3-setuptools

essential:
- python3-setuptools_copyright

slices:
libs:
essential:
- python3-pkg-resources_libs
- python3_standard
contents:
/usr/lib/python3/dist-packages/_distutils_hack/**:
/usr/lib/python3/dist-packages/setuptools-*.egg-info/**:
/usr/lib/python3/dist-packages/setuptools/**:

copyright:
contents:
/usr/share/doc/python3-setuptools/copyright:
16 changes: 16 additions & 0 deletions slices/python3-wheel.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package: python3-wheel

essential:
- python3-wheel_copyright

slices:
libs:
essential:
- python3_standard
contents:
/usr/lib/python3/dist-packages/wheel-*.dist-info/**:
/usr/lib/python3/dist-packages/wheel/**:

copyright:
contents:
/usr/share/doc/python3-wheel/copyright:
27 changes: 27 additions & 0 deletions slices/redis-server.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package: redis-server

essential:
- redis-server_copyright

slices:
bins:
essential:
- redis-server_config
- redis-tools_bins
contents:
/usr/bin/redis-server:

config:
contents:
/etc/redis/redis.conf:

services:
essential:
- redis-server_bins
contents:
/usr/lib/systemd/system/redis-server.service:
/usr/lib/systemd/system/[email protected]:

copyright:
contents:
/usr/share/doc/redis-server/copyright:
26 changes: 26 additions & 0 deletions slices/redis-tools.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package: redis-tools

essential:
- redis-tools_copyright

slices:
bins:
# redis-tools actually depends on adduser as well to create and remove
# a user during package install/removal - however we don't support this
# currently so adduser is not added here.
essential:
- libatomic1_libs
- libc6_libs
- libjemalloc2_libs
- liblzf1_libs
- libssl3t64_libs
- libsystemd0_libs
contents:
/usr/bin/redis-benchmark:
/usr/bin/redis-check-aof:
/usr/bin/redis-check-rdb:
/usr/bin/redis-cli:

copyright:
contents:
/usr/share/doc/redis-tools/copyright:
Loading

0 comments on commit 062940e

Please sign in to comment.