Fixed description

Uses Syncthing Generated Request

Closes #2

See merge request !1

CHANGELOG

@@ -9,3 +9,12 @@
 
 [0.1.3]
 * Updated postinstall message
+
+[0.2.0]
+* Upstream version 0.14.29
+* Uses syncthing generated config (thanks to @rymnel)
+* Fixed typo in manifest (thanks to @rymnel)
+* Running under user cloudron
+
+[0.2.1]
+* Fixed description

CloudronManifest.json

@@ -5,7 +5,7 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
   "tagline": "Decentralized file synchronization",
-  "version": "0.1.3",
+  "version": "0.2.1",
   "healthCheckPath": "/check",
   "httpPort": 8000,
   "addons": {
@@ -21,7 +21,7 @@
     }
   },
   "manifestVersion": 1,
-  "website": "http://syncthing.net",
+  "website": "https://syncthing.net",
   "contactEmail": "support@cloudron.io",
   "icon": "logo.png",
   "tags": [

DESCRIPTION.md

@@ -1,4 +1,4 @@
-This app packages Syncthing v0.14.27.
+This app packages Syncthing <upstream>v0.14.29</upstream>.
 
 Syncthing replaces proprietary sync and cloud services with something open, trustworthy and decentralized. Your data is your data alone and you deserve to choose where it is stored, if it is shared with some third party and how it's transmitted over the Internet.
 

Dockerfile

@@ -28,7 +28,7 @@ RUN ./configure \
     --build=cloudron-river
 RUN make install
 
-ENV VERSION 0.14.27
+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 - \
@@ -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
 

README.md

@@ -31,7 +31,6 @@ The e2e tests are located in the `test/` folder and require [nodejs](http://node
 cd syncthing-app/test
 
 npm install
-export PATH=$PATH:node_modules/.bin
-USERNAME=user PASSWORD=password mocha --bail test.js
+PATH=$PATH:node_modules/.bin USERNAME=user PASSWORD=password mocha --bail test.js
 ```
 

config.xml

@@ -1,15 +0,0 @@
-<configuration version="19">
-    <gui enabled="true" tls="false" debugging="false">
-        <insecureAdminAccess>true</insecureAdminAccess>
-        <address>0.0.0.0:3000</address>
-        <theme>default</theme>
-    </gui>
-    <options>
-        <listenAddress>tcp://:22000</listenAddress>
-        <localAnnounceEnabled>false</localAnnounceEnabled>
-        <startBrowser>false</startBrowser>
-        <natEnabled>true</natEnabled>
-        <autoUpgradeIntervalH>0</autoUpgradeIntervalH>
-        <upgradeToPreReleases>false</upgradeToPreReleases>
-    </options>
-</configuration>

inittab

@@ -1,2 +1,2 @@
-::respawn:/app/code/syncthing -gui-address=0.0.0.0:3000 -home=/app/data/config -no-browser >/dev/stdout 2>/dev/stderr
+::respawn:sudo -nu cloudron /app/code/syncthing -gui-address=0.0.0.0:3000 -home=/app/data/config -no-browser >/dev/stdout 2>/dev/stderr
 ::respawn:/usr/local/nginx/sbin/nginx -c /app/code/nginx.conf

start.sh

@@ -4,8 +4,12 @@ set -eu
 
 mkdir -p /app/data/config
 
-if ! [ -f /app/data/config/config.xml ]; then
-  cp /app/code/config.xml.default /app/data/config/config.xml
+export STNODEFAULTFOLDER=1 STNOUPGRADE=1
+
+# 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"
 fi
 
 cat >/run/ldap.conf <<EOF
@@ -19,9 +23,11 @@ ldap_server cloudron {
 }
 EOF
 
+# Set the listenAddress and the gui enabled to make sure user doesnt lock themselves  out by accident.
 sed -e 's,<listenAddress>.*</listenAddress>,<listenAddress>tcp://:22000</listenAddress>,' -i /app/data/config/config.xml
 sed -e 's,<gui .*>,<gui enabled="true" tls="false" debugging="false">,' -i /app/data/config/config.xml
 
-export STNODEFAULTFOLDER=1 STNOUPGRADE=1
+chown -R cloudron:cloudron /app/data/config /app/data
+
 exec busybox init
 

test/test.js

@@ -46,7 +46,7 @@ describe('Application life cycle test', function () {
         done();
     });
 
-    var LOCATION = 'syncthing-test';
+    var LOCATION = 'test';
     var TEST_TIMEOUT = 30000;
     var SYNC_PORT = 22001;
     var app;