From b19a9f972c6789c2990e2205aef3d40d7d047420 Mon Sep 17 00:00:00 2001 From: James Valleroy Date: Mon, 28 Aug 2017 19:55:24 -0400 Subject: [PATCH] users: Move ldap structure config into normal setup Signed-off-by: James Valleroy Reviewed-by: Sunil Mohan Adapa --- actions/users | 19 +++------------ data/usr/lib/freedombox/first-run.d/50_ldap | 27 --------------------- 2 files changed, 3 insertions(+), 43 deletions(-) delete mode 100755 data/usr/lib/freedombox/first-run.d/50_ldap diff --git a/actions/users b/actions/users index b3511bbb7..d5622f950 100755 --- a/actions/users +++ b/actions/users @@ -37,8 +37,6 @@ def parse_arguments(): subparsers = parser.add_subparsers(dest='subcommand', help='Sub command') subparsers.add_parser('setup', help='Setup LDAP') - subparsers.add_parser('first-run', - help='Additional setup performed after reboot') subparsers.required = True return parser.parse_args() @@ -53,9 +51,6 @@ def subcommand_setup(_): configure_slapd() - -def subcommand_first_run(_): - """Additional setup performed after reboot.""" configure_ldap_structure() @@ -72,17 +67,9 @@ def configure_slapd(): def configure_ldap_structure(): """Configure LDAP basic structure.""" - was_running = action_utils.service_is_running('slapd') - if not was_running: - action_utils.service_start('slapd') - - try: - setup_admin() - create_organizational_unit('users') - create_organizational_unit('groups') - finally: - if not was_running: - action_utils.service_stop('slapd') + setup_admin() + create_organizational_unit('users') + create_organizational_unit('groups') def create_organizational_unit(unit): diff --git a/data/usr/lib/freedombox/first-run.d/50_ldap b/data/usr/lib/freedombox/first-run.d/50_ldap deleted file mode 100755 index c5f453887..000000000 --- a/data/usr/lib/freedombox/first-run.d/50_ldap +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -# -# This file is part of Plinth. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program 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 Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# - -# Exit with an error code on any failure -set -e - -# Enable tracing to see the commands in -# /var/log/freedombox-first-run.log -set -x - -# Setup LDAP structure -/usr/share/plinth/actions/users first-run