Skip to content
GitLab
Explore
Sign in
Register
Commits on Source (2)
Revert "White-space-only change: Fix broken and inconsistent indentations."
· 0bd6da24
Mike Gabriel
authored
Aug 10, 2019
This reverts commit
a542ec14
.
0bd6da24
White-space-only change: Fix broken and inconsistent indentations.
· 5a337615
Mike Gabriel
authored
Aug 10, 2019
5a337615
Hide whitespace changes
Inline
Side-by-side
debian/debian-edu-config.fetch-ldap-cert
View file @
5a337615
...
...
@@ -46,6 +46,7 @@ do_start() {
[
"
$VERBOSE
"
!=
no
]
&&
log_action_begin_msg
"Fetching LDAP SSL certificate."
if
echo
| openssl s_client
-connect
"
$LDAPSERVER
:
$LDAPPORT
"
2>/dev/null |
grep
RootCA
;
then
if
curl
-sfk
--head
-o
/dev/null https://www.intern
;
then
if
curl
-k
https://www.intern/Debian-Edu_rootCA.crt
>
$ROOTCACRT
&&
\
grep
-q
CERTIFICATE
$ROOTCACRT
;
then
...
...
@@ -61,15 +62,19 @@ do_start() {
rm
-f
$BUNDLECRT
logger
-t
fetch-ldap-cert
"Failed to fetch certificates from www.intern."
fi
fi
else
log_action_end_msg 1
logger
-t
fetch-ldap-cert
"Failed to connect to www.intern, maybe the web server down."
ERROR
=
true
fi
else
/usr/share/debian-edu-config/tools/ldap-server-getcert
$LDAPSERVER
>
$CERTFILE
.new
chmod
644
$CERTFILE
.new
logger
-t
fetch-ldap-cert
"Fetched pre Buster LDAP server certificate."
fi
if
test
-s
$CERTFILE
.new
;
then
...
...
@@ -94,7 +99,7 @@ do_start() {
for
ltsp_chroot
in
`
find /opt/ltsp/
-mindepth
1
-maxdepth
1
-type
d
`
;
do
if
[
!
-f
$ltsp_chroot$CERTFILE
]
&&
[
-f
$ltsp_chroot
/etc/nslcd.conf
]
&&
grep
-q
/etc/ssl/certs/debian-edu-server.crt
$ltsp_chroot
/etc/nslcd.conf
;
then
[
"
$VERBOSE
"
!=
no
]
&&
[
"
$VERBOSE
"
!=
no
]
&&
log_action_begin_msg
"Copying LDAP SSL certificate to ltsp-chroot
$ltsp_chroot
"
if
test
-s
$CERTFILE
;
then
cp
$CERTFILE
$ltsp_chroot$CERTFILE
...
...