diff --git a/src/freedombone-app-matrix b/src/freedombone-app-matrix index b51b4148..9632e4ad 100755 --- a/src/freedombone-app-matrix +++ b/src/freedombone-app-matrix @@ -548,21 +548,16 @@ function install_identity_server { exit 798362 fi - function_check matrix_generate_identityserver_file - matrix_generate_identityserver_file /etc/sydent/sydent.conf + #function_check matrix_generate_identityserver_file + #matrix_generate_identityserver_file /etc/sydent/sydent.conf - if [ ! -f /etc/sydent/sydent.conf ]; then - echo $'Matrix identity server configuration not generated' - exit 72528 - fi + #if [ ! -f /etc/sydent/sydent.conf ]; then + # echo $'Matrix identity server configuration not generated' + # exit 72528 + #fi - function_check matrix_configure_identityserver - matrix_configure_identityserver - - if [ ! -f /etc/sydent/sydent.conf ]; then - echo $'Matrix identity server config was not generated' - exit 82352 - fi + #function_check matrix_configure_identityserver + #matrix_configure_identityserver chmod -R 700 /etc/sydent/sydent.conf chown -R matrix:matrix /etc/sydent @@ -575,7 +570,7 @@ function install_identity_server { echo 'Type=simple' >> /etc/systemd/system/sydent.service echo 'User=matrix' >> /etc/systemd/system/sydent.service echo "WorkingDirectory=/etc/sydent" >> /etc/systemd/system/sydent.service - echo "ExecStart=/usr/bin/python -m sydent.sydent --config-path /etc/sydent/sydent.conf" >> /etc/systemd/system/sydent.service + echo "ExecStart=/usr/bin/python -m sydent.sydent --config-path /etc/sydent/sydent.conf --report-stats ${REPORT_STATS} --server-name ${DEFAULT_DOMAIN_NAME}" >> /etc/systemd/system/sydent.service echo 'Restart=always' >> /etc/systemd/system/sydent.service echo 'RestartSec=10' >> /etc/systemd/system/sydent.service echo '' >> /etc/systemd/system/sydent.service @@ -585,6 +580,13 @@ function install_identity_server { systemctl daemon-reload systemctl start sydent + sleep 5 + + if [ ! -f /etc/sydent/sydent.conf ]; then + echo $'Matrix identity server config was not generated' + exit 82352 + fi + if [ ! -f /etc/sydent/sydent.db ]; then echo $'No matrix identity server database was created' exit 7354383