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

First try at moving panel and powerdns to using admin@domain

Browse Source
This commit is contained in:
root 2023-08-01 13:10:03 +00:00
parent aa7b3599d1
commit d51c7c825e
6 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bin/convertdomain
View File

@ -99,6 +99,9 @@ convert_powerdns() {
# Start service with command to make sure it's up before proceeding # Start service with command to make sure it's up before proceeding
start_service_convert "pdnsadmin" "nc -z ${SERVICE_IP} 9494 &> /dev/null" start_service_convert "pdnsadmin" "nc -z ${SERVICE_IP} 9494 &> /dev/null"
MYSQL_ROOTPASSWORD=`cat /federated/apps/pdnsmysql/.env | grep MYSQL_ROOT_PASSWORD | awk -F= '{ print $2 }'`
docker exec pdnsmysql bash -c "mysql -uroot -p$MYSQL_ROOTPASSWORD -e \"update user set username='admin@$DOMAIN_NEW' where id='1';\""
echo -ne "done." echo -ne "done."
} }
convert_traefik() { convert_traefik() {

BIN
lib/files/panel/ldapusermanager-v1.10.tar.gz
View File

Binary file not shown.

BIN
lib/files/panel/ldapusermanager-v1.11.tar.gz Normal file
View File

Binary file not shown.

4
lib/functions.sh
View File

@ -334,7 +334,7 @@ administrative privileges, but please be cautious.
Additional documentation about the Panel service can be found at Additional documentation about the Panel service can be found at
https://documentation.federated.computer/docs/core_applications/panel. https://documentation.federated.computer/docs/core_applications/panel.
<p> <p>
Username: admin<br> Username: admin@$DOMAIN<br>
Password: as given above Password: as given above
<p> <p>
<h4>Email</h4> <h4>Email</h4>
@ -473,7 +473,7 @@ https://documentation.federated.computer/docs/core_applications/powerdns.
<p> <p>
Only the admin user has access to this service. Only the admin user has access to this service.
<p> <p>
Username: admin<br> Username: admin@$DOMAIN<br>
Password: as given above<br> Password: as given above<br>
<p> <p>
<h4>Castopod: <a href="https://castopod.$DOMAIN/cp-auth/login">https://castopod.$DOMAIN/cp-auth/login</a></h4> <h4>Castopod: <a href="https://castopod.$DOMAIN/cp-auth/login">https://castopod.$DOMAIN/cp-auth/login</a></h4>

4
lib/panel.sh
View File

@ -48,7 +48,7 @@ tar zxvf /federated/lib/files/panel/ldapusermanager-* -C /federated/apps/panel/d
LDAP_SECRET=`cat /federated/apps/ldap/.ldap.secret` LDAP_SECRET=`cat /federated/apps/ldap/.ldap.secret`
cat > /federated/apps/panel/.env <<EOF cat > /federated/apps/panel/.env <<EOF
IMAGE_VERSION="v1.10" IMAGE_VERSION="v1.11"
SERVER_HOSTNAME=panel.$DOMAIN SERVER_HOSTNAME=panel.$DOMAIN
LDAP_URI=ldap://ldap.$DOMAIN LDAP_URI=ldap://ldap.$DOMAIN
LDAP_BASE_DN=dc=federatedcomputer,dc=cloud LDAP_BASE_DN=dc=federatedcomputer,dc=cloud
@ -61,6 +61,8 @@ LDAP_ACCOUNT_ADDITIONAL_ATTRIBUTES=mailEnabled:Mail Enabled:TRUE,mailAlias+:Emai
EMAIL_DOMAIN=$DOMAIN EMAIL_DOMAIN=$DOMAIN
ENFORCE_SAFE_SYSTEM_NAMES=false ENFORCE_SAFE_SYSTEM_NAMES=false
USERNAME_FORMAT={first_name}.{last_name} USERNAME_FORMAT={first_name}.{last_name}
SITE_LOGIN_LDAP_ATTRIBUTE=mail
SITE_LOGIN_FIELD_LABEL="Email Address"
SITE_NAME=$COMPANY User Manager SITE_NAME=$COMPANY User Manager
SMTP_HOSTNAME=mail.$DOMAIN SMTP_HOSTNAME=mail.$DOMAIN
SMTP_USERNAME=admin SMTP_USERNAME=admin

2
lib/pdnsadmin.sh
View File

@ -44,7 +44,7 @@ EOF
MYSQL_PASSWORD=`grep MYSQL_PASSWORD /federated/apps/pdnsmysql/.env | awk -F= '{ print $2 }'` MYSQL_PASSWORD=`grep MYSQL_PASSWORD /federated/apps/pdnsmysql/.env | awk -F= '{ print $2 }'`
PDNS_APIKEY=`grep PDNS_api_key /federated/apps/pdns/.env | awk -F= '{ print $2 }'` PDNS_APIKEY=`grep PDNS_api_key /federated/apps/pdns/.env | awk -F= '{ print $2 }'`
PDNS_ADMIN_WEBSERVER_PASSWORD_SALT=`htpasswd -bnBC 10 "" $ADMINPASS | tr -d ':\n' | sed 's/$2y/$2b/'` PDNS_ADMIN_WEBSERVER_PASSWORD_SALT=`htpasswd -bnBC 10 "" $ADMINPASS | tr -d ':\n' | sed 's/$2y/$2b/'`
PDNS_MYSQL_COMMAND="insert into user (id, username, password, firstname, lastname, email, otp_secret, role_id, confirmed) values (\"1\", \"admin\", \"$PDNS_ADMIN_WEBSERVER_PASSWORD_SALT\", \"Admin\", \"Federated\", \"admin@$DOMAIN\", \"\", \"1\", \"0\");" PDNS_MYSQL_COMMAND="insert into user (id, username, password, firstname, lastname, email, otp_secret, role_id, confirmed) values (\"1\", \"admin@$DOMAIN\", \"$PDNS_ADMIN_WEBSERVER_PASSWORD_SALT\", \"Admin\", \"Federated\", \"admin@$DOMAIN\", \"\", \"1\", \"0\");"
cat > /federated/apps/pdnsadmin/.env <<EOF cat > /federated/apps/pdnsadmin/.env <<EOF
IMAGE_VERSION="@sha256:d4bcc2cd76bd1711c1501555a8db3b932ad58425a4ecc362aac13e97b082d5c2" IMAGE_VERSION="@sha256:d4bcc2cd76bd1711c1501555a8db3b932ad58425a4ecc362aac13e97b082d5c2"