Merge pull request '142_lacreadm' (#145) from 142_lacreadm into main

Reviewed-on: #145

.gitignore

@@ -13,7 +13,6 @@ dist
 build
 eggs
 parts
-bin
 var
 sdist
 develop-eggs

bin/lacreadm

@@ -0,0 +1,21 @@
+#!/bin/sh
+#
+# lacre
+#
+# This file is part of the lacre source code.
+#
+# lacre is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# lacre source code is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with lacre source code. If not, see <http://www.gnu.org/licenses/>.
+#
+
+python -m lacre.admin $*

doc/admin.md

@@ -14,6 +14,9 @@ Of course `-h` displays some help.
 **Note:** Help output includes information about the configuration file being
 in use, which may be useful at times.
 
+**Note:** You can also use a tiny shell wrapper around this tool, see
+`bin/lacreadm`.
+
 
 ## Initialising database schema
 

lacre/admin.py

@@ -109,6 +109,7 @@ def main():
     missing = conf.validate_config()
     if missing:
         LOG.error('Missing configuration parameters: %s', missing)
+        print('Insufficient configuration, aborting.')
         sys.exit(lacre.EX_CONFIG)
 
     general_conf = conf.config_source()

lacre/daemon.py

@@ -124,7 +124,10 @@ async def _main():
 
         keyring.post_init_hook()
 
-        LOG.info('Starting the daemon...')
+        LOG.info('Starting the daemon with GnuPG=%s, socket=%s, database=%s',
+                 keyring_path,
+                 conf.daemon_params(),
+                 conf.get_item('database', 'url'))
         controller.start()
 
         await _sleep()