nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-03-11 09:04:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

users: Move ldap structure config into normal setup

Browse Source 
Signed-off-by: James Valleroy <jvalleroy@mailbox.org>
Reviewed-by: Sunil Mohan Adapa <sunil@medhas.org>
This commit is contained in:
James Valleroy 2017-08-28 19:55:24 -04:00 committed by Sunil Mohan Adapa
parent f9166f8e98
commit b19a9f972c
No known key found for this signature in database
GPG Key ID: 43EA1CFF0AA7C5F2
2 changed files with 3 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
actions/users
View File

@ -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):

27
data/usr/lib/freedombox/first-run.d/50_ldap
View File

@ -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 <http://www.gnu.org/licenses/>.
#
# 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