bero/test
1
0
Fork 0
Code Issues 52 Pull Requests 3 Actions Packages Projects Releases Wiki Activity

Fixed https and panel login issues

Browse Source
This commit is contained in:
root 2022-09-19 13:23:13 +00:00
parent e98f392fe2
commit 9e675420b0
4 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fstack/lib/ldap.sh
View File

@ -90,7 +90,7 @@ objectClass: top
objectClass: posixGroup objectClass: posixGroup
objectClass: groupOfUniqueNames objectClass: groupOfUniqueNames
cn: everybody cn: everybody
uniqueMember: uid=admin-federated,ou=people,dc=$DOMAIN_FIRST,dc=$DOMAIN_LAST uniqueMember: uid=admin,ou=people,dc=$DOMAIN_FIRST,dc=$DOMAIN_LAST
gidNumber: 2001 gidNumber: 2001
structuralObjectClass: groupOfUniqueNames structuralObjectClass: groupOfUniqueNames
@ -99,11 +99,12 @@ objectClass: top
objectClass: posixGroup objectClass: posixGroup
objectClass: groupOfUniqueNames objectClass: groupOfUniqueNames
cn: admins cn: admins
uniqueMember: uid=admin-$DOMAIN_FIRST,ou=people,dc=$DOMAIN_FIRST,dc=$DOMAIN_LAST uniqueMember: uid=admin,ou=people,dc=$DOMAIN_FIRST,dc=$DOMAIN_LAST
gidNumber: 2002 gidNumber: 2002
structuralObjectClass: groupOfUniqueNames structuralObjectClass: groupOfUniqueNames
dn: uid=admin,ou=people,dc=$DOMAIN_FIRST,dc=$DOMAIN_LAST dn: uid=admin,ou=people,dc=$DOMAIN_FIRST,dc=$DOMAIN_LAST
givenName: admin
sn: admin sn: admin
uid: admin uid: admin
mail: admin@$DOMAIN mail: admin@$DOMAIN
@ -120,8 +121,8 @@ gidNumber: 2001
loginShell: /bin/bash loginShell: /bin/bash
homeDirectory: /home/admin homeDirectory: /home/admin
structuralObjectClass: inetOrgPerson structuralObjectClass: inetOrgPerson
memberOf: cn=everybody,ou=groups,dc=$DOMAIN_FIRST,dc=$DOMAIN_LAST
memberOf: cn=admins,ou=groups,dc=$DOMAIN_FIRST,dc=$DOMAIN_LAST memberOf: cn=admins,ou=groups,dc=$DOMAIN_FIRST,dc=$DOMAIN_LAST
memberOf: cn=everybody,ou=groups,dc=$DOMAIN_FIRST,dc=$DOMAIN_LAST
EOF EOF
cat > fstack/ldap/data/root/ldap.sh <<'EOF' cat > fstack/ldap/data/root/ldap.sh <<'EOF'
@ -160,7 +161,7 @@ start_ldap() {
# Keep trying ldap port to make sure it's up # Keep trying ldap port to make sure it's up
# before we proceed # before we proceed
RETRY="23" RETRY="25"
while [ $RETRY -gt 0 ]; do while [ $RETRY -gt 0 ]; do
nc -z 172.99.0.11 636 &> /dev/null nc -z 172.99.0.11 636 &> /dev/null
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then

6
fstack/lib/mail.sh
View File

@ -195,6 +195,12 @@ start_mail() {
docker exec -it dns rndc reload &> /dev/null docker exec -it dns rndc reload &> /dev/null
[ $? -ne 0 ] && fail "Couldn't run rndc reload on fstack/dns container" [ $? -ne 0 ] && fail "Couldn't run rndc reload on fstack/dns container"
# Enable SSL module in fstack/webmail
docker exec -it webmail a2enmod ssl &> /dev/null
[ $? -ne 0 ] && fail "Couldn't run a2enmod ssl in fstack/webmail container"
docker exec -it webmail service apache2 restart
kill -9 $SPINPID &> /dev/null kill -9 $SPINPID &> /dev/null
echo -ne "done." echo -ne "done."
} }

6
fstack/lib/nextcloud.sh
View File

@ -172,6 +172,12 @@ start_nextcloud() {
docker exec -it -u 33 nextcloud /var/www/html/nextcloud.sh &> /dev/null docker exec -it -u 33 nextcloud /var/www/html/nextcloud.sh &> /dev/null
[ $? -ne 0 ] && fail "Couldn't run nextcloud.sh inside fstack/nextcloud container" [ $? -ne 0 ] && fail "Couldn't run nextcloud.sh inside fstack/nextcloud container"
# Enable SSL module in fstack/nextcloud
docker exec -it nextcloud a2enmod ssl
[ $? -ne 0 ] && fail "Couldn't run a2enmod ssl in fstack/nextcloud container"
docker exec -it nextcloud service apache2 restart
kill -9 $SPINPID &> /dev/null kill -9 $SPINPID &> /dev/null
echo -ne "done." echo -ne "done."
} }

2
install-federated.sh
View File

@ -1,4 +1,4 @@
#!/bin/bash #!/bin/bash -x
# #
# Federated Stack installation script # Federated Stack installation script