From 4e805ba62fbf550ff0601efb2e431d0b78a22f0e Mon Sep 17 00:00:00 2001 From: Shane Perry Date: Thu, 25 May 2017 21:15:12 -0500 Subject: [PATCH 01/10] Bumps version to 0.14.28 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ea4a245..3d054dc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,7 +28,7 @@ RUN ./configure \ --build=cloudron-river RUN make install -ENV VERSION 0.14.27 +ENV VERSION 0.14.28 RUN mkdir -p /app/code \ && wget https://github.com/syncthing/syncthing/releases/download/v${VERSION}/syncthing-linux-amd64-v${VERSION}.tar.gz -O - \ From 012db8bad13f67c69f4042b81ca3c9bf098343e5 Mon Sep 17 00:00:00 2001 From: Shane Perry Date: Thu, 25 May 2017 21:19:46 -0500 Subject: [PATCH 02/10] Generates full syncthing config; removes warning about authentication at startup; Adds Default folder --- start.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/start.sh b/start.sh index dc4ff2b..38191a1 100755 --- a/start.sh +++ b/start.sh @@ -3,9 +3,15 @@ set -eu mkdir -p /app/data/config +chown -R cloudron:cloudron /app/data/config /app/data & -if ! [ -f /app/data/config/config.xml ]; then - cp /app/code/config.xml.default /app/data/config/config.xml +# if this if the first run, generate a useful config +if [ ! -f /app/data/config/config.xml ]; then + echo "=> Generating config" + /app/code/syncthing --generate="/app/data/config" + # don't take the whole volume with the default so that we can add additional folders + sed -i "s/path=\"\/root\/Sync\/\" /path=\"\/app\/data\/default\/\"/g" /app/data/config/config.xml + sed -e 's,.*,tcp://:22000,' -i /app/data/config/config.xml fi cat >/run/ldap.conf <.*,tcp://:22000,' -i /app/data/config/config.xml -sed -e 's,,,' -i /app/data/config/config.xml - export STNODEFAULTFOLDER=1 STNOUPGRADE=1 exec busybox init From 831efb6f8cc34f39773b15d214f76f030006e79f Mon Sep 17 00:00:00 2001 From: Shane Perry Date: Thu, 25 May 2017 21:26:54 -0500 Subject: [PATCH 03/10] Fixes #2; Fixes broken link --- CloudronManifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CloudronManifest.json b/CloudronManifest.json index 11a7c10..2e9e9db 100644 --- a/CloudronManifest.json +++ b/CloudronManifest.json @@ -21,7 +21,7 @@ } }, "manifestVersion": 1, - "website": "http://www.synthing.net", + "website": "https://syncthing.net", "contactEmail": "support@cloudron.io", "icon": "logo.png", "tags": [ From d1c449aef8ab50084ee8e15895f5ba3a4ff60015 Mon Sep 17 00:00:00 2001 From: Shane Perry Date: Thu, 25 May 2017 21:28:12 -0500 Subject: [PATCH 04/10] Removes now unused config.xml file --- config.xml | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 config.xml diff --git a/config.xml b/config.xml deleted file mode 100644 index 2a47a40..0000000 --- a/config.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - true -
0.0.0.0:3000
- default - - - tcp://:22000 - false - false - true - 0 - false - - From 5e085fc42a3441c77f5bc17041174a55d3c01c31 Mon Sep 17 00:00:00 2001 From: Shane Perry Date: Thu, 25 May 2017 21:30:48 -0500 Subject: [PATCH 05/10] Bumps package version to 0.1.2 --- CHANGELOG | 4 ++++ CloudronManifest.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 949afee..80ea253 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,3 +3,7 @@ [0.1.1] * Huge speedup by caching ldap + +[0.1.2] +* Uses syncthing generated config +* Bumps to version 0.14.28 diff --git a/CloudronManifest.json b/CloudronManifest.json index 2e9e9db..2b5b6e0 100644 --- a/CloudronManifest.json +++ b/CloudronManifest.json @@ -5,7 +5,7 @@ "description": "file://DESCRIPTION.md", "changelog": "file://CHANGELOG", "tagline": "Decentralized file synchronization", - "version": "0.1.1", + "version": "0.1.2", "healthCheckPath": "/check", "httpPort": 8000, "addons": { From 92ae28d0da1a22577a8157c1a6171bade4460b80 Mon Sep 17 00:00:00 2001 From: Shane Perry Date: Thu, 25 May 2017 21:32:49 -0500 Subject: [PATCH 06/10] Dockerfile no longer adds the hardcoded config.xml --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3d054dc..89ec8a2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,7 +37,6 @@ RUN mkdir -p /app/code \ WORKDIR /app/code ADD nginx.conf /app/code/nginx.conf -ADD config.xml /app/code/config.xml.default ADD inittab /etc/inittab ADD start.sh /app/code/start.sh From 3e83a29587d93f3f5882177597e51d629cf7ef9c Mon Sep 17 00:00:00 2001 From: Shane Perry Date: Tue, 6 Jun 2017 07:15:41 -0500 Subject: [PATCH 07/10] Updates Changelog to 0.1.3 --- CHANGELOG | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 94cbaa0..7f3ac43 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,9 +5,10 @@ * Huge speedup by caching ldap [0.1.2] -<<<<<<< HEAD -* Uses syncthing generated config -* Bumps to version 0.14.28 -======= * Fixed wrong URL ->>>>>>> 37b6969e241d42fce63138f87dfb344503708d53 + +[0.1.3] +* Uses syncthing generated config +* Bumps to version 0.14.29 + + From 02e9dbdedc62ad6bd4d260555832eedf84511bc3 Mon Sep 17 00:00:00 2001 From: Shane Perry Date: Tue, 6 Jun 2017 07:17:23 -0500 Subject: [PATCH 08/10] Bumps CloudronManifest.json to version 0.1.3 --- CloudronManifest.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/CloudronManifest.json b/CloudronManifest.json index 13d54c0..68355f6 100644 --- a/CloudronManifest.json +++ b/CloudronManifest.json @@ -5,7 +5,7 @@ "description": "file://DESCRIPTION.md", "changelog": "file://CHANGELOG", "tagline": "Decentralized file synchronization", - "version": "0.1.2", + "version": "0.1.3", "healthCheckPath": "/check", "httpPort": 8000, "addons": { @@ -21,11 +21,7 @@ } }, "manifestVersion": 1, -<<<<<<< HEAD "website": "https://syncthing.net", -======= - "website": "http://syncthing.net", ->>>>>>> 37b6969e241d42fce63138f87dfb344503708d53 "contactEmail": "support@cloudron.io", "icon": "logo.png", "tags": [ From e628a70b60f489bc61554be45634a8503a378b5e Mon Sep 17 00:00:00 2001 From: Shane Perry Date: Tue, 6 Jun 2017 07:51:20 -0500 Subject: [PATCH 09/10] Bumps syncthing version to 0.14.29 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 89ec8a2..056b680 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,7 +28,7 @@ RUN ./configure \ --build=cloudron-river RUN make install -ENV VERSION 0.14.28 +ENV VERSION 0.14.29 RUN mkdir -p /app/code \ && wget https://github.com/syncthing/syncthing/releases/download/v${VERSION}/syncthing-linux-amd64-v${VERSION}.tar.gz -O - \ From 3d8ea247819303f2772650c3c89c5a8d907b4f72 Mon Sep 17 00:00:00 2001 From: Shane Perry Date: Wed, 7 Jun 2017 17:26:33 -0500 Subject: [PATCH 10/10] Adds back some config settings in order to confirm they are set on each startup --- start.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/start.sh b/start.sh index 38191a1..abacc3a 100755 --- a/start.sh +++ b/start.sh @@ -11,7 +11,6 @@ if [ ! -f /app/data/config/config.xml ]; then /app/code/syncthing --generate="/app/data/config" # don't take the whole volume with the default so that we can add additional folders sed -i "s/path=\"\/root\/Sync\/\" /path=\"\/app\/data\/default\/\"/g" /app/data/config/config.xml - sed -e 's,.*,tcp://:22000,' -i /app/data/config/config.xml fi cat >/run/ldap.conf <.*,tcp://:22000,' -i /app/data/config/config.xml +sed -e 's,,,' -i /app/data/config/config.xml + export STNODEFAULTFOLDER=1 STNOUPGRADE=1 exec busybox init