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

Added get_appvars, fixed wordpress to use them

Browse Source
This commit is contained in:
root 2024-02-09 18:43:04 +00:00
parent f61c6b5a4c
commit 88347f5d96
3 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bin/convertmmrimport Normal file → Executable file
View File

@ -26,6 +26,9 @@ HOSTNAME=$1
[ ! -f "/federated/tmp/$HOSTNAME-synapse-database.zip" ] && failcheck "/federated/tmp/$HOSTNAME-synapse-database.zip doesn't exist."
[ ! -f "/federated/tmp/$HOSTNAME-media-$HOSTNAME.zip" ] && failcheck "/federated/tmp/$HOSTNAME-media-$HOSTNAME.zip doesn't exist."
# Install unzip
sudo apt install unzip -y
# First install MMR server
#/federated/bin/installapp matrixmmr
@ -130,7 +133,7 @@ unzip -jo /federated/tmp/$HOSTNAME-synapse-database.zip -d /federated/apps/postg
[ $? -ne 0 ] && failcheck "Couldn't unzip database files into postgresql container"
# Run pg_restore on database files
docker exec postgresql /bin/bash -c "PGPASSWORD=$MATRIX_SECRET pg_restore -w --username $USERNAME --host $HOSTNAME --dbname $DATABASENAME --no-owner /docker-entrypoint-initdb.d/matrixdatabase/"
docker exec postgresql /bin/bash -c "PGPASSWORD=$MATRIX_SECRET pg_restore -w --username matrix --host postgresql.$DOMAIN --dbname matrix --no-owner /docker-entrypoint-initdb.d/matrixdatabase/"
[ $? -ne 0 ] && failcheck "Couldn't run pg_restore on database files inside postgresql container"
# Run SELECT * FROM state_group_id_seq; and make sure last_value is greater than 1

10
lib/functions.sh
View File

@ -1356,3 +1356,13 @@ check_memory() {
get_installedapps() {
SERVICES=( $(ls -d /federated/apps/* | awk -F/ '{ print $4 }') )
}
get_appvars() {
LDAP_SECRET=`cat /federated/apps/ldap/.ldap.secret`
ADMINPASS=`cat /federated/apps/panel/.env | grep SMTP_PASSWORD | awk -F= '{ print $2 }'`
EXTERNALIP=$(get_externalip);
MYSQL_ROOTPASSWORD=`cat /federated/apps/pdnsmysql/.env | grep MYSQL_ROOT_PASSWORD | awk -F= '{ print $2 }'`
MATRIX_SECRET=$(cat /federated/apps/postgresql/data/docker-entrypoint-initdb.d/init.sql | grep matrix | grep PASSWORD | awk -F\' '{ print $2 }')
# Set SMTP user based on if fcore exists
[[ $(docker exec ldap slapcat | grep fcore) ]] && SMTPUSER="fcore" || SMTPUSER="admin"
}

22
lib/wordpress.sh
View File

@ -3,6 +3,7 @@
# Wordpress Service
PATH=$HOME/.docker/cli-plugins:/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
get_appvars
config_wordpress() {
echo -ne "\n* Configuring wordpress container.."
@ -14,12 +15,7 @@ config_wordpress() {
chown -R 1001 /federated/apps/wordpress/data/bitnami/wordpress
fi
ADMINPASS=`cat /federated/apps/panel/.env | grep SMTP_PASSWORD | awk -F= '{ print $2 }'`
EXTERNALIP=$(get_externalip);
WORDPRESS_SECRET=$(create_password);
MYSQL_ROOTPASSWORD=`cat /federated/apps/pdnsmysql/.env | grep MYSQL_ROOT_PASSWORD | awk -F= '{ print $2 }'`
# Set SMTP user based on if fcore exists
[[ $(docker exec ldap slapcat | grep fcore) ]] && SMTPUSER="fcore" || SMTPUSER="admin"
WORDPRESS_SECRET=$(create_password);
cat > /federated/apps/wordpress/docker-compose.yml <<EOF
version: "3.7"
@ -119,7 +115,7 @@ Here is your applications chart with on how to access this service:<br>
.tg .tg-cul6{border-color:inherit;color:#340096;text-align:left;text-decoration:underline;vertical-align:top}
.tg .tg-acii{background-color:#FFF;border-color:inherit;color:#333;text-align:left;vertical-align:top}
.tg .tg-0hty{background-color:#000000;border-color:inherit;color:#ffffff;font-weight:bold;text-align:left;vertical-align:top}
.tg .tg-kwiq{border-color:inherit;color:#000000;text-align:left;vertical-align:top}
.tg .tg-kwiq{border-color:inherit;color:#000000;text-align:left;vertical-align:top;word-wrap:break-word}
.tg .tg-0pky{border-color:inherit;text-align:left;vertical-align:top}
</style>
<table class="tg" style="undefined;table-layout: fixed; width: 996px">
@ -143,12 +139,12 @@ Here is your applications chart with on how to access this service:<br>
</thead>
<tbody>
<tr>
<td class="tg-0pky">Wordpress</td>
<td class="tg-0pky"><a href="https://www.$DOMAIN/login" target="_blank" rel="noopener noreferrer"><span style="color:#340096">www.$DOMAIN/login</span></a></td>
<td class="tg-0pky">admin@$DOMAIN<br>$ADMINPASS</td>
<td class="tg-0pky">User access is separate from panel</td>
<td class="tg-cul6"><a href="https://documentation.federated.computer/docs/getting_started/welcome/" target="_blank" rel="noopener noreferrer"><span style="color:#340096">Click here</span></a></td>
<td class="tg-0pky">Wordpress is a dynamic content management solution used by 10s of millions of websites around the globe</td>
<td class="tg-kwiq">Wordpress</td>
<td class="tg-kwiq"><a href="https://www.$DOMAIN/login" target="_blank" rel="noopener noreferrer"><span style="color:#340096">www.$DOMAIN/login</span></a></td>
<td class="tg-kwiq">admin@$DOMAIN<br>$ADMINPASS</td>
<td class="tg-kwiq">User access is separate from panel</td>
<td class="tg-kwiq"><a href="https://documentation.federated.computer/docs/getting_started/welcome/" target="_blank" rel="noopener noreferrer"><span style="color:#340096">Click here</span></a></td>
<td class="tg-kwiq">Wordpress is a dynamic content management solution used by 10s of millions of websites around the globe</td>
</tr>
</tbody>
</table>