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

14 files changed, 32 insertions, 32 deletions

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. </li>
 <h3> Configuration </h3>
 
 <ul>
- <li> <a href="s6-frontend.conf.html">The <tt>/etc/s6-frontend.conf</tt> configuration file </a> </li>
+ <li> <a href="s6.conf.html">The <tt>/etc/s6.conf</tt> configuration file </a> </li>
 </ul>
 
 <h2> Related resources </h2>
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? &#x1F92D; </li>
 installed by the package manager, one for local modifications, and possibly
 one that is managed by the distribution outside of any package. The default
 <em>store list</em> for s6-frontend is
-<tt>/usr/share/s6-frontend/s6-rc/sources:/etc/s6-frontend/s6-rc/sources</tt>,
+<tt>/usr/share/s6/sources:/etc/s6/sources</tt>,
 which means that the package manager should install service definition
-directories in <tt>/usr/share/s6-frontend/s6-rc/sources</tt>, and that
+directories in <tt>/usr/share/s6/sources</tt>, and that
 administrators should do their local modifications in
-<tt>/etc/s6-frontend/s6-rc/sources</tt>. You can modify this store list
+<tt>/etc/s6/sources</tt>. You can modify this store list
 at build time with the <tt>--storelist</tt> configure option, or after
 installation in the s6-frontend configuration file, see below. </li>
  </ul> </li>
@@ -176,8 +176,8 @@ we recommend downloading the
 demo stores</a> and put them in your storelist. </li>
     </ul> </li>
   </ul> </li>
- <li> Define a <a href="s6-frontend.conf.html">configuration file</a>,
-located at <tt>/etc/s6-frontend.conf</tt> unless you modified the default at
+ <li> Define a <a href="s6.conf.html">configuration file</a>,
+located at <tt>/etc/s6.conf</tt> 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 <tt>storelist</tt> variable. </li>
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 <a href="s6.html">s6</a> instead.
 
 <ul>
  <li> <a href="s6.html">s6</a> gets the name of its configuration file from the
-<tt>S6_FRONTEND_CONF</tt> environment variable, or from the compiled-in default if
-this variable is unset. Normally this default is <tt>/etc/s6-frontend.conf</tt>. </li>
+<tt>S6_CONF</tt> environment variable, or from the compiled-in default if
+this variable is unset. Normally this default is <tt>/etc/s6.conf</tt>. </li>
  <li> This configuration file (let's call it <em>conf</em>) contains
-<a href="s6-frontend.conf.html">variable definitions</a> that set the default for
+<a href="s6.conf.html">variable definitions</a> that set the default for
 all the parts of the s6 system. </li>
  <li> <a href="s6.html">s6</a> rewrites itself into
 <code>envfile -I <em>conf</em> -- s6-frontend <em>args...</em></code> </li>
@@ -55,7 +55,7 @@ performs the work described in the documents linked from the <a href="s6.html">s
 
 <p>
  The separation between <a href="s6.html">s6</a> and s6-frontend is really just a
-trick to avoid writing an additional parser for the <a href="s6-frontend.conf.html">s6-frontend.conf</a>
+trick to avoid writing an additional parser for the <a href="s6.conf.html">s6.conf</a>
 configuration file. Using <a
 href="//skarnet.org/software/execline/envfile.html">envfile</a> to read the
 configuration was a natural fit because the <a href="//skarnet.org/software/execline/">execline</a> set of tools is used by
diff --git a/doc/s6-frontend.conf.html b/doc/s6.conf.html
index 2f3eea2..39b1e76 100644
--- a/doc/s6-frontend.conf.html
+++ b/doc/s6.conf.html
@@ -4,9 +4,9 @@
     <meta name="color-scheme" content="dark light" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <meta http-equiv="Content-Language" content="en" />
-    <title>s6-frontend: the s6-frontend.conf configuration file</title>
-    <meta name="Description" content="s6-frontend: the s6-frontend.conf configuration file" />
-    <meta name="Keywords" content="s6-frontend.conf s6-frontend configuration file execline variable" />
+    <title>s6-frontend: the s6.conf configuration file</title>
+    <meta name="Description" content="s6-frontend: the s6.conf configuration file" />
+    <meta name="Keywords" content="s6.conf s6-frontend configuration file execline variable" />
     <!-- <link rel="stylesheet" type="text/css" href="//skarnet.org/default.css" /> -->
   </head>
 <body>
@@ -17,12 +17,12 @@
 <a href="//skarnet.org/">skarnet.org</a>
 </p>
 
-<h1> The <tt>/etc/s6-frontend.conf</tt> configuration file </h1>
+<h1> The <tt>/etc/s6.conf</tt> configuration file </h1>
 
 <h2 id="goal"> Goal and usage </h2>
 
 <p>
- <tt>/etc/s6-frontend.conf</tt> is a configuration file provided by the
+ <tt>/etc/s6.conf</tt> is a configuration file provided by the
 distribution, or written by the system administrator, defining various
 settings for the <a href="s6.html">s6</a> commands, as well as the default
 policies of an s6-based system (i.e. where various directories and files
@@ -40,7 +40,7 @@ what the full path to the <em>foobar</em> service directory is.
 <h2 id="description"> Description </h2>
 
 <p>
-The <tt>/etc/s6-frontend.conf</tt> file follows the
+The <tt>/etc/s6.conf</tt> file follows the
 <a href="//skarnet.org/software/execline/envfile.html#syntax">envfile syntax</a>:
 simple <code>key = value</code> lines, comments permitted.
 </p>
@@ -90,7 +90,7 @@ The default is <tt>/run/s6-frontend</tt> (possibly overridden by the <tt>--stmpd
 <dd> A colon-separated (<tt>:</tt>) list of directories containing the
 <a href="//skarnet.org/software/s6-rc/repodefs.html#store">stores</a> of s6-rc service
 definition directories.
-The default is <tt>/usr/share/s6-frontend/s6-rc/sources:/etc/s6-frontend/s6-rc/sources</tt>
+The default is <tt>/usr/share/s6/sources:/etc/s6/sources</tt>
 (possibly overridden by the <tt>--storelist</tt> build-time configure option to
 <a href="//skarnet.org/software/s6-frontend/">s6-frontend</a>). </dd>
 
diff --git a/doc/s6.html b/doc/s6.html
index bfa771f..a5454c3 100644
--- a/doc/s6.html
+++ b/doc/s6.html
@@ -66,10 +66,10 @@ of its various exit codes.
 <h2 id="env"> Environment variables </h2>
 
 <ul>
- <li> s6 reads the <code>S6_FRONTEND_CONF</code> environment variable
+ <li> s6 reads the <code>S6_CONF</code> environment variable
 containing the absolute path to the
-<a href="s6-frontend.conf.html">configuration file</a> for the s6 command. </li>
- <li> If this variable is unset, the default is <tt>/etc/s6-frontend.conf</tt>,
+<a href="s6.conf.html">configuration file</a> for the s6 command. </li>
+ <li> If this variable is unset, the default is <tt>/etc/s6.conf</tt>,
 possibly overridden by the <tt>--conffile</tt> build-time configure option to
 s6-frontend. </li>
 </ul>
@@ -79,7 +79,7 @@ s6-frontend. </li>
 <p>
  <em>global_options...</em> is a list of options that modify s6's behaviour
 and policies. They should generally not be used; instead, the behaviour should
-be set in the <a href="s6-frontend.conf.html">configuration file</a>.
+be set in the <a href="s6.conf.html">configuration file</a>.
 Nevertheless, if you need to override the configuration file settings for some
 reason, here you go.
 </p>
@@ -224,7 +224,7 @@ The details are available <a href="s6_system.html">here</a>.
 
 <ul>
  <li> <tt>s6</tt> does not perform real operations itself. Instead, after
-finding the path to its <a href="s6-frontend.conf.html">configuration file</a>
+finding the path to its <a href="s6.conf.html">configuration file</a>
 <em>conf</em>, it rewrites itself into <code>envfile -I <em>conf</em> -- s6-frontend
 <em>global_options...</em> <em>command</em> <em>subcommand</em> <em>subcommand_options...</em> <em>args...</em></code>
   <ul>
diff --git a/doc/s6_live.html b/doc/s6_live.html
index ce716b9..53f3359 100644
--- a/doc/s6_live.html
+++ b/doc/s6_live.html
@@ -23,7 +23,7 @@
 <p>
  <tt>s6 live</tt> groups actions that target the live <em>machine state</em>
 managed by the <a href="//skarnet.org/software/s6-rc/">s6-rc</a> service manager,
-hosted in the <a href="s6-frontend.conf.html">configured</a> <em>livedir</em>.
+hosted in the <a href="s6.conf.html">configured</a> <em>livedir</em>.
 </p>
 
 <p>
diff --git a/doc/s6_process.html b/doc/s6_process.html
index 025409a..8f7d8e7 100644
--- a/doc/s6_process.html
+++ b/doc/s6_process.html
@@ -23,7 +23,7 @@
 <p>
  <tt>s6 process</tt> groups actions that target services that are managed
 by an instance of <a href="//skarnet.org/software/s6/s6-svscan.html">s6-svscan</a>
-running on the <a href="s6-frontend.conf.html">configured</a> <em>scandir</em>.
+running on the <a href="s6.conf.html">configured</a> <em>scandir</em>.
 All commands (other than help) require the services in <em>servicenames...</em>
 to be a valid reference to a <a
 href="//skarnet.org/software/s6/servicedir.html">service directory</a> with an
diff --git a/doc/s6_repository.html b/doc/s6_repository.html
index b9aa06a..1d33c0b 100644
--- a/doc/s6_repository.html
+++ b/doc/s6_repository.html
@@ -24,7 +24,7 @@
  <tt>s6 repository</tt> groups actions that target the repository of <a href="//skarnet.org/software/s6-rc/">s6-rc</a>source
 definition directories for services managed by the
 <a href="//skarnet.org/software/s6-rc/repodefs.html">repo commands</a>. The
-repository is hosted in the <a href="s6-frontend.conf.html">configured</a>
+repository is hosted in the <a href="s6.conf.html">configured</a>
 <em>repodir</em>.
 </p>
 
diff --git a/doc/s6_version.html b/doc/s6_version.html
index 85b3d20..075cdd9 100644
--- a/doc/s6_version.html
+++ b/doc/s6_version.html
@@ -71,7 +71,7 @@ current running version of s6-frontend, then a newline. </li>
 representing the version and configuration data for the current running version
 of s6-frontend. </li>
  <li> Keys are: <tt>version</tt>, then all the variables that are supported in
-the <a href="s6-frontend.conf.html">configuration file</a>. </li>
+the <a href="s6.conf.html">configuration file</a>. </li>
 </ul>
 
 <h4> Options </h4>
diff --git a/package/configure-snippets/configure_help_install b/package/configure-snippets/configure_help_install
index ff03391..82ead11 100644
--- a/package/configure-snippets/configure_help_install
+++ b/package/configure-snippets/configure_help_install
@@ -3,4 +3,4 @@
   --repodir=DIR                 default s6-rc repository [s6-rc default: /var/lib/s6-rc/repository]
   --bootdb=LINK                 location of the bootable s6-rc compiled db [s6-rc default: /etc/s6-rc/compiled/current]
   --stmpdir=DIR                 secure location for temporary s6-frontend files [/run/s6-frontend]
-  --conffile=FILE               default configuration file for s6 command [SYSCONFDIR/s6-frontend.conf]
+  --conffile=FILE               default configuration file for s6 command [SYSCONFDIR/s6.conf]
diff --git a/package/configure-snippets/configure_help_options b/package/configure-snippets/configure_help_options
index 1f4150d..1d79b20 100644
--- a/package/configure-snippets/configure_help_options
+++ b/package/configure-snippets/configure_help_options
@@ -2,6 +2,6 @@
   --disable-s6li                do not use s6-linux-init functionality [enabled]
   --enable-util-linux           use util-linux functionality [disabled]
 
-  --with-store-list=LIST        list of service stores [PREFIX/share/s6-frontend/s6-rc/sources:SYSCONFDIR/s6-frontend/s6-rc/sources]
+  --with-store-list=LIST        list of service stores [PREFIX/share/s6/sources:SYSCONFDIR/s6/sources]
   --with-default-bundle=NAME    name of the bundle started at boot [s6-rc default: default]
 
diff --git a/package/configure-snippets/configure_init_vars b/package/configure-snippets/configure_init_vars
index 52ffdfc..e9af35a 100644
--- a/package/configure-snippets/configure_init_vars
+++ b/package/configure-snippets/configure_init_vars
@@ -3,8 +3,8 @@ livedir=
 repodir=
 bootdb=
 stmpdir=/run/s6-frontend
-conffile='$sysconfdir/s6-frontend.conf'
-storelist='$prefix/share/s6-frontend/s6-rc/sources:$sysconfdir/s6-frontend/s6-rc/sources'
+conffile='$sysconfdir/s6.conf'
+storelist='$prefix/share/s6/sources:$sysconfdir/s6/sources'
 defbundle=
 
 usensss=false
diff --git a/package/deps-build b/package/deps-build
index eb95d54..bfb4e0f 100644
--- a/package/deps-build
+++ b/package/deps-build
@@ -1,6 +1,6 @@
 true		true		/package/prog/skalibs		2.15.0.1	libskarnet
 $usensss	$usensss	/package/admin/nsss		0.2.1.2		libnsss
 true		false		/package/admin/execline		2.9.9.2		libexecline
-true		false		/package/admin/s6		2.15.0.1	libs6 libs6auto
+true		false		/package/admin/s6		2.15.1.0	libs6 libs6auto
 true		false		/package/admin/s6-rc		0.6.1.2		libs6rc
 true		false		/package/admin/s6-linux-init	1.2.0.2
diff --git a/src/s6-frontend/s6.c b/src/s6-frontend/s6.c
index 8777b8d..0e49885 100644
--- a/src/s6-frontend/s6.c
+++ b/src/s6-frontend/s6.c
@@ -10,7 +10,7 @@
 
 int main (int argc, char const *const *argv)
 {
-  char const *conffile = getenv("S6_FRONTEND_CONF") ;
+  char const *conffile = getenv("S6_CONF") ;
   PROG = "s6" ;
   if (!conffile) conffile = S6_FRONTEND_CONF ;
   if (!argc--) strerr_dief1x(103, "invalid argc/argv") ;