From e7dc6510922fc3ed14df061a1bac552da59b62e9 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Tue, 9 Jun 2026 03:54:33 +0000 Subject: Change default storelist and configuration file Default storelist becomes /usr/share/s6/sources:/etc/s6/sources Default configuration file becomes /etc/s6.conf Conffile environment variable becomes S6_CONF --- doc/index.html | 2 +- doc/overview.html | 10 ++--- doc/s6-frontend.conf.html | 105 ---------------------------------------------- doc/s6-frontend.html | 8 ++-- doc/s6.conf.html | 105 ++++++++++++++++++++++++++++++++++++++++++++++ doc/s6.html | 10 ++--- doc/s6_live.html | 2 +- doc/s6_process.html | 2 +- doc/s6_repository.html | 2 +- doc/s6_version.html | 2 +- 10 files changed, 124 insertions(+), 124 deletions(-) delete mode 100644 doc/s6-frontend.conf.html create mode 100644 doc/s6.conf.html (limited to 'doc') diff --git a/doc/index.html b/doc/index.html index 3cd2b77..52bd505 100644 --- a/doc/index.html +++ b/doc/index.html @@ -181,7 +181,7 @@ the previous versions of s6-frontend and the current one.

Configuration

Related resources

diff --git a/doc/overview.html b/doc/overview.html index 2571d60..f0f45f0 100644 --- a/doc/overview.html +++ b/doc/overview.html @@ -141,11 +141,11 @@ But who are we to criticize if it works for them? 🤭 installed by the package manager, one for local modifications, and possibly one that is managed by the distribution outside of any package. The default store list for s6-frontend is -/usr/share/s6-frontend/s6-rc/sources:/etc/s6-frontend/s6-rc/sources, +/usr/share/s6/sources:/etc/s6/sources, which means that the package manager should install service definition -directories in /usr/share/s6-frontend/s6-rc/sources, and that +directories in /usr/share/s6/sources, and that administrators should do their local modifications in -/etc/s6-frontend/s6-rc/sources. You can modify this store list +/etc/s6/sources. You can modify this store list at build time with the --storelist configure option, or after installation in the s6-frontend configuration file, see below. @@ -176,8 +176,8 @@ we recommend downloading the demo stores and put them in your storelist. -
  • Define a configuration file, -located at /etc/s6-frontend.conf unless you modified the default at +
  • Define a configuration file, +located at /etc/s6.conf unless you modified the default at build time. If you have gone with all the defaults for all the packages in the s6 ecosystem, the configuration file can basically be empty; but you will probably at least want to define the storelist variable.
    • diff --git a/doc/s6-frontend.conf.html b/doc/s6-frontend.conf.html deleted file mode 100644 index 2f3eea2..0000000 --- a/doc/s6-frontend.conf.html +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - - s6-frontend: the s6-frontend.conf configuration file - - - - - - -

    -s6-frontend
    -Software
    -skarnet.org -

    - -

    The /etc/s6-frontend.conf configuration file

    - -

    Goal and usage

    - -

    - /etc/s6-frontend.conf is a configuration file provided by the -distribution, or written by the system administrator, defining various -settings for the s6 commands, as well as the default -policies of an s6-based system (i.e. where various directories and files -are located). -

    - -

    - For instance, this is what allows the -s6 process restart foobar command to send -s6-svc -r to the -foobar service without the user needing to type, or even remember, -what the full path to the foobar service directory is. -

    - -

    Description

    - -

    -The /etc/s6-frontend.conf file follows the -envfile syntax: -simple key = value lines, comments permitted. -

    - -

    - If a value is left empty, the compiled-in default is used. -

    - -

    - The variables that can be set are the following: -

    - -
    -
    scandir
    -
    The directory where s6-svscan -is running. -The default is /run/service (possibly overridden by the --scandir build-time configure option to -s6-linux-init or to -s6-frontend).
    - -
    livedir
    -
    The directory hosting the live service database managed by -s6-rc. -The default is /run/s6-rc (possibly overridden by the --livedir build-time configure option to -s6-rc or to -s6-frontend).
    - -
    repodir
    -
    The directory hosting the repository of service sets managed by the -s6-rc repo commands. -The default is /var/lib/s6-rc/repository (possibly overridden by the --repodir build-time configure option to -s6-rc or to -s6-frontend).
    - -
    bootdb
    -
    The path to the boot-time compiled service database. -The default is /etc/s6-rc/compiled/current (possibly overridden by the --bootdb build-time configure option to -s6-rc or to -s6-frontend).
    - -
    stmpdir
    -
    A directory suitable for root-only runtime data and temporary files for s6-frontend. -The default is /run/s6-frontend (possibly overridden by the --stmpdir build-time configure option to -s6-frontend).
    - -
    storelist
    -
    A colon-separated (:) list of directories containing the -stores of s6-rc service -definition directories. -The default is /usr/share/s6-frontend/s6-rc/sources:/etc/s6-frontend/s6-rc/sources -(possibly overridden by the --storelist build-time configure option to -s6-frontend).
    - -
    verbosity
    -
    The default verbosity for s6 and its invoked commands. 0 is -terse (only print fatal error messages), 1 is normal (print error messages and warnings), -over 1 is increasingly verbose (print informational messages, up to tracing and debug -messages at level 4-5). The default is 1.
    -
    - - - diff --git a/doc/s6-frontend.html b/doc/s6-frontend.html index c6b5d5c..9d563f7 100644 --- a/doc/s6-frontend.html +++ b/doc/s6-frontend.html @@ -39,10 +39,10 @@ users should call s6 instead.