use settings file

diff --git a/molly-guard.xml b/molly-guard.xml
index 01988adfc4482a226f6e266e37827b86fa4574da..4daf3da35702b42969ba83f505bed78afe629088 100644 (file)
--- a/molly-guard.xml
+++ b/molly-guard.xml
@@ -164,7 +164,7 @@ and docbook-xsl in your Build-Depends control field.
     <para> &dhcommand; was primarily designed to shield SSH connections. This
       functionality (which should arguably be provided by the
       <package>openssh-server</package> package) is implemented in
     <para> &dhcommand; was primarily designed to shield SSH connections. This
       functionality (which should arguably be provided by the
       <package>openssh-server</package> package) is implemented in

-      <filename>/etc/molly-guard/run.d/10-print-message</filename>.</para>
+      <filename>/etc/molly-guard/run.d/30-query-hostname</filename>.</para>

 
     <para> This script first tests whether the command is being executed from
       a <filename>tty</filename> which has been created by
 
     <para> This script first tests whether the command is being executed from
       a <filename>tty</filename> which has been created by


@@ -177,7 +177,7 @@ and docbook-xsl in your Build-Depends control field.
     <para> You can pass the <option>--pretend-ssh</option> script option to
       &dhcommand; to pretend that those tests succeeds. Alternatively, setting
       <envar>ALWAYS_QUERY_HOSTNAME</envar> in
     <para> You can pass the <option>--pretend-ssh</option> script option to
       &dhcommand; to pretend that those tests succeeds. Alternatively, setting
       <envar>ALWAYS_QUERY_HOSTNAME</envar> in

-      <filename>/etc/default/molly-guard</filename> causes the script to
+      <filename>/etc/molly-guard/rc</filename> causes the script to

       always query.</para>
 
     <para> The following situations are still UNGUARDED. If you can think of
       always query.</para>
 
     <para> The following situations are still UNGUARDED. If you can think of

diff --git a/rc b/rc
new file mode 100644 (file)
index 0000000..d5b87cc
--- /dev/null
+++ b/rc
@@ -0,0 +1,6 @@
+# molly-guard settings
+#
+# ALWAYS_QUERY_HOSTNAME
+# when set, causes the 30-query-hostname script to always ask for the
+# hostname, even if no SSH session was detected.
+#ALWAYS_QUERY_HOSTNAME=true

diff --git a/run.d/30-ask-hostname b/run.d/30-query-hostname
similarity index 100%
rename from run.d/30-ask-hostname
rename to run.d/30-query-hostname

diff --git a/shutdown b/shutdown
index 2e24f7fdfa29a616d569804b50aa130f8df8d5d2..7a36d9486b8f062b229c5345d57e99699ddeab7e 100755 (executable)
--- a/shutdown
+++ b/shutdown
@@ -104,7 +104,7 @@ esac
 
 MOLLYGUARD_CMD=$CMD; export MOLLYGUARD_CMD
 MOLLYGUARD_DO_NOTHING=$DO_NOTHING; export MOLLYGUARD_DO_NOTHING
 
 MOLLYGUARD_CMD=$CMD; export MOLLYGUARD_CMD
 MOLLYGUARD_DO_NOTHING=$DO_NOTHING; export MOLLYGUARD_DO_NOTHING

-MOLLYGUARD_SETTINGS="/etc/default/$ME"; export MOLLYGUARD_SETTINGS
+MOLLYGUARD_SETTINGS="/etc/molly-guard/rc"; export MOLLYGUARD_SETTINGS

 
 for script in $(run-parts --test $SCRIPTSDIR); do
   ret=0
 
 for script in $(run-parts --test $SCRIPTSDIR); do
   ret=0