mirror of
https://git.cloudron.io/cloudron/syncthing-app
synced 2025-09-18 11:09:14 +00:00
Compare commits
3 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
0afa587f81 | ||
|
457996f9cb | ||
|
33406ddc9c |
@@ -616,3 +616,6 @@
|
||||
* The handling of conflict resolution involving deleted files has changed. A delete can now be the winning outcome of conflict resolution, resulting in the deleted file being moved to a conflict copy.
|
||||
* build: remove netgo and osusergo build tags (fixes [#10251](https://github.com/syncthing/syncthing/issues/10251)) by [@calmh](https://github.com/calmh) in https://github.com/syncthing/syncthing/pull/10256
|
||||
|
||||
[1.33.3]
|
||||
* Fix checklist
|
||||
|
||||
|
@@ -5,7 +5,7 @@
|
||||
"description": "file://DESCRIPTION.md",
|
||||
"changelog": "file://CHANGELOG",
|
||||
"tagline": "Decentralized file synchronization",
|
||||
"version": "1.32.2",
|
||||
"version": "1.33.3",
|
||||
"upstreamVersion": "2.0.2",
|
||||
"healthCheckPath": "/healthcheck",
|
||||
"httpPort": 8000,
|
||||
@@ -15,7 +15,8 @@
|
||||
},
|
||||
"checklist": {
|
||||
"change-default-password": {
|
||||
"message": "Change the admin password immediately."
|
||||
"message": "Change the admin password immediately.",
|
||||
"sso": false
|
||||
}
|
||||
},
|
||||
"tcpPorts": {
|
||||
|
5
start.sh
5
start.sh
@@ -6,7 +6,7 @@ mkdir -p /app/data/config /app/data/folders /run/syncthing
|
||||
|
||||
# if this if the first run, generate a useful config
|
||||
if [[ ! -f /app/data/config/config.xml ]]; then
|
||||
echo "=> Generating config"
|
||||
echo "==> Generating config"
|
||||
STNODEFAULTFOLDER=1 /app/code/syncthing generate --home="/app/data/config"
|
||||
|
||||
# The password value (changeme) was determined by reading config.xml and setting value in the GUI
|
||||
@@ -31,12 +31,11 @@ if [[ -n ${CLOUDRON_LDAP_HOST:-} ]]; then
|
||||
/app/data/config/config.xml
|
||||
fi
|
||||
|
||||
|
||||
# Set the listenAddress and the gui enabled to make sure user doesnt lock themselves out by accident.
|
||||
sed -e "s,<listenAddress>.*</listenAddress>,<listenAddress>tcp://:${SYNC_PORT}</listenAddress>," -i /app/data/config/config.xml
|
||||
sed -e 's,<gui .*>,<gui enabled="true" tls="false" debugging="false">,' -i /app/data/config/config.xml
|
||||
|
||||
chown -R cloudron:cloudron /app/data /run/syncthing
|
||||
|
||||
echo "Starting supervisor"
|
||||
echo "==> Starting supervisor"
|
||||
exec /usr/bin/supervisord --configuration /etc/supervisor/supervisord.conf --nodaemon -i syncthing
|
||||
|
Reference in New Issue
Block a user