瀏覽代碼

Check size of homeserver config

Bob Mottram 8 年之前
父節點
當前提交
e478d0d0a2
共有 1 個文件被更改,包括 10 次插入5 次删除
  1. 10
    5
      src/freedombone-app-matrix

+ 10
- 5
src/freedombone-app-matrix 查看文件

104
         echo "STOP! REPORT_STATS needs to be 'no' or 'yes'" && breakup="1"
104
         echo "STOP! REPORT_STATS needs to be 'no' or 'yes'" && breakup="1"
105
 
105
 
106
     matrix_generate_synapse_file ${MATRIX_DATA_DIR}/homeserver.tmp
106
     matrix_generate_synapse_file ${MATRIX_DATA_DIR}/homeserver.tmp
107
-    matrix_configure_homeserver_yaml $turnkey ${MATRIX_DATA_DIR}/homeserver.tmp
107
+    matrix_configure_homeserver_yaml "${turnkey}" ${MATRIX_DATA_DIR}/homeserver.tmp
108
 
108
 
109
     mv ${MATRIX_DATA_DIR}/homeserver.tmp ${MATRIX_DATA_DIR}/homeserver.yaml
109
     mv ${MATRIX_DATA_DIR}/homeserver.tmp ${MATRIX_DATA_DIR}/homeserver.yaml
110
 }
110
 }
124
     ${PROJECT_NAME}-pass -u $new_username -a matrix -p "$new_user_password"
124
     ${PROJECT_NAME}-pass -u $new_username -a matrix -p "$new_user_password"
125
 
125
 
126
     read_config_param 'MATRIX_SECRET'
126
     read_config_param 'MATRIX_SECRET'
127
-    register_new_matrix_user -c ${MATRIX_DATA_DIR}/homeserver.yaml https://localhost:${MATRIX_PORT} -u "${new_username}" -p "${new_user_password}" -k "${MATRIX_SECRET}" -a
127
+    register_new_matrix_user -c ${MATRIX_DATA_DIR}/homeserver.yaml https://localhost:${MATRIX_PORT} -u "${new_username}" -p "${new_user_password}" -a
128
     if [ ! "$?" = "0" ]; then
128
     if [ ! "$?" = "0" ]; then
129
         echo '1'
129
         echo '1'
130
     else
130
     else
320
     groupadd matrix
320
     groupadd matrix
321
     useradd -c "Matrix system account" -d /var/lib/matrix -m -r -g matrix matrix
321
     useradd -c "Matrix system account" -d /var/lib/matrix -m -r -g matrix matrix
322
 
322
 
323
-    chown -R matrix:matrix /etc/matrix
324
-    chown -R matrix:matrix /var/lib/matrix
325
-
326
     function_check install_turn
323
     function_check install_turn
327
     install_turn
324
     install_turn
328
     MATRIX_SECRET="${turnkey}"
325
     MATRIX_SECRET="${turnkey}"
330
     function_check matrix_generate
327
     function_check matrix_generate
331
     matrix_generate
328
     matrix_generate
332
 
329
 
330
+    if [ -z ${MATRIX_DATA_DIR}/homeserver.yaml ]; then
331
+        echo $'homeserver.yaml is zero size'
332
+        exit 783724
333
+    fi
334
+
335
+    chown -R matrix:matrix /etc/matrix
336
+    chown -R matrix:matrix /var/lib/matrix
337
+
333
     echo '[Unit]' > /etc/systemd/system/matrix.service
338
     echo '[Unit]' > /etc/systemd/system/matrix.service
334
     echo 'Description=Matrix federated messaging' >> /etc/systemd/system/matrix.service
339
     echo 'Description=Matrix federated messaging' >> /etc/systemd/system/matrix.service
335
     echo 'After=network.target nginx.target' >> /etc/systemd/system/matrix.service
340
     echo 'After=network.target nginx.target' >> /etc/systemd/system/matrix.service