|
@@ -548,21 +548,16 @@ function install_identity_server {
|
548
|
548
|
exit 798362
|
549
|
549
|
fi
|
550
|
550
|
|
551
|
|
- function_check matrix_generate_identityserver_file
|
552
|
|
- matrix_generate_identityserver_file /etc/sydent/sydent.conf
|
|
551
|
+ #function_check matrix_generate_identityserver_file
|
|
552
|
+ #matrix_generate_identityserver_file /etc/sydent/sydent.conf
|
553
|
553
|
|
554
|
|
- if [ ! -f /etc/sydent/sydent.conf ]; then
|
555
|
|
- echo $'Matrix identity server configuration not generated'
|
556
|
|
- exit 72528
|
557
|
|
- fi
|
|
554
|
+ #if [ ! -f /etc/sydent/sydent.conf ]; then
|
|
555
|
+ # echo $'Matrix identity server configuration not generated'
|
|
556
|
+ # exit 72528
|
|
557
|
+ #fi
|
558
|
558
|
|
559
|
|
- function_check matrix_configure_identityserver
|
560
|
|
- matrix_configure_identityserver
|
561
|
|
-
|
562
|
|
- if [ ! -f /etc/sydent/sydent.conf ]; then
|
563
|
|
- echo $'Matrix identity server config was not generated'
|
564
|
|
- exit 82352
|
565
|
|
- fi
|
|
559
|
+ #function_check matrix_configure_identityserver
|
|
560
|
+ #matrix_configure_identityserver
|
566
|
561
|
|
567
|
562
|
chmod -R 700 /etc/sydent/sydent.conf
|
568
|
563
|
chown -R matrix:matrix /etc/sydent
|
|
@@ -575,7 +570,7 @@ function install_identity_server {
|
575
|
570
|
echo 'Type=simple' >> /etc/systemd/system/sydent.service
|
576
|
571
|
echo 'User=matrix' >> /etc/systemd/system/sydent.service
|
577
|
572
|
echo "WorkingDirectory=/etc/sydent" >> /etc/systemd/system/sydent.service
|
578
|
|
- echo "ExecStart=/usr/bin/python -m sydent.sydent --config-path /etc/sydent/sydent.conf" >> /etc/systemd/system/sydent.service
|
|
573
|
+ 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
|
579
|
574
|
echo 'Restart=always' >> /etc/systemd/system/sydent.service
|
580
|
575
|
echo 'RestartSec=10' >> /etc/systemd/system/sydent.service
|
581
|
576
|
echo '' >> /etc/systemd/system/sydent.service
|
|
@@ -585,6 +580,13 @@ function install_identity_server {
|
585
|
580
|
systemctl daemon-reload
|
586
|
581
|
systemctl start sydent
|
587
|
582
|
|
|
583
|
+ sleep 5
|
|
584
|
+
|
|
585
|
+ if [ ! -f /etc/sydent/sydent.conf ]; then
|
|
586
|
+ echo $'Matrix identity server config was not generated'
|
|
587
|
+ exit 82352
|
|
588
|
+ fi
|
|
589
|
+
|
588
|
590
|
if [ ! -f /etc/sydent/sydent.db ]; then
|
589
|
591
|
echo $'No matrix identity server database was created'
|
590
|
592
|
exit 7354383
|