Преглед изворни кода

Merge branch 'stretch' of https://github.com/bashrc/freedombone

Bob Mottram пре 6 година
родитељ
комит
b845514646

BIN
image_build/prosody-0.10-1nightly468.tar.gz Прегледај датотеку


BIN
image_build/prosody-0.10-1nightly478.tar.gz Прегледај датотеку


+ 12
- 2
src/freedombone-app-gogs Прегледај датотеку

150
         return
150
         return
151
     fi
151
     fi
152
 
152
 
153
+    GOGS_CONFIG_PATH=/home/${GOGS_USERNAME}/custom/conf
154
+    GOGS_CONFIG_FILE=$GOGS_CONFIG_PATH/app.ini
155
+
156
+    # Change port number if necessary
157
+    if ! grep -q "HTTP_PORT = ${GOGS_PORT}" "${GOGS_CONFIG_FILE}"; then
158
+        sed -i "s|HTTP_PORT =.*|HTTP_PORT = ${GOGS_PORT}|g" "${GOGS_CONFIG_FILE}"
159
+        read_config_param GIT_DOMAIN_NAME
160
+        sed -i "s|proxy_pass .*|proxy_pass http://localhost:${GOGS_PORT};|g" "/etc/nginx/sites-available/${GIT_DOMAIN_NAME}"
161
+        systemctl restart gogs
162
+        systemctl restart nginx
163
+    fi
164
+
153
     CURR_GOGS_VERSION=$(get_completion_param "gogs version")
165
     CURR_GOGS_VERSION=$(get_completion_param "gogs version")
154
     echo "gogs current version: ${CURR_GOGS_VERSION}"
166
     echo "gogs current version: ${CURR_GOGS_VERSION}"
155
     echo "gogs app version: ${GOGS_VERSION}"
167
     echo "gogs app version: ${GOGS_VERSION}"
157
         return
169
         return
158
     fi
170
     fi
159
 
171
 
160
-    GOGS_CONFIG_PATH=/home/${GOGS_USERNAME}/custom/conf
161
-    GOGS_CONFIG_FILE=$GOGS_CONFIG_PATH/app.ini
162
     cp "$GOGS_CONFIG_FILE $INSTALL_DIR/gogs_config.ini"
172
     cp "$GOGS_CONFIG_FILE $INSTALL_DIR/gogs_config.ini"
163
 
173
 
164
     if [ -d "$INSTALL_DIR/gogs-repositories" ]; then
174
     if [ -d "$INSTALL_DIR/gogs-repositories" ]; then

+ 2
- 2
src/freedombone-app-xmpp Прегледај датотеку

43
 XMPP_ECC_CURVE='"secp384r1"'
43
 XMPP_ECC_CURVE='"secp384r1"'
44
 
44
 
45
 prosody_latest_version='0.10'
45
 prosody_latest_version='0.10'
46
-prosody_nightly=468
47
-prosody_nightly_hash='c72aaab1182a86090188284f443d2f819889ca242d4e955258ef60f4c7c9a1ba'
46
+prosody_nightly=478
47
+prosody_nightly_hash='884e773920dbcd0a748d05391235df3ff2b82285357b13cb347c99564512593e'
48
 prosody_filename=prosody-${prosody_latest_version}-1nightly${prosody_nightly}
48
 prosody_filename=prosody-${prosody_latest_version}-1nightly${prosody_nightly}
49
 prosody_nightly_url="https://prosody.im/nightly/${prosody_latest_version}/latest/${prosody_filename}.tar.gz"
49
 prosody_nightly_url="https://prosody.im/nightly/${prosody_latest_version}/latest/${prosody_filename}.tar.gz"
50
 
50