Version 1.7.2

This reverts commit aa6baa6ab9.

This is unnecessary, let the app decide the best UX

CHANGELOG

@@ -46,3 +46,111 @@
 [0.3.4]
 * Updated to version 0.14.38
 
+[0.4.0]
+* Updated to version 0.14.39
+* #4357: Removing paused folders no longer triggers a crash.
+* #4360: Add further security related HTTP headers
+* #4375: Improve info level logging in some cases
+* #4377: Improve GUI tooltips in chromium based browsers
+* #4382: Hide temporary files on Windows
+* #4387: Add -device-id command line switch
+
+[0.5.0]
+* Updated to version 0.14.40
+
+[1.0.0]
+* Updated to version 0.14.44
+* #4634: Panic when connecting to device with auto accept and paused folders
+* #4636: List of files needed on remote is not wrapped at word boundaries
+* #4644: Impossible to run non-release builds without deadlock detectors
+* #4649: UTF-8 normalization does not work correctly on ZFS.
+* #4654: Upgrade system shows an error on RCs in some cases
+* #4657: Sparse files with zero blocks are not closed when pulling
+* #4668: Remote device out of sync items shows "0 items, ~0 B"
+
+[1.0.1]
+* Updated to version 0.14.45
+* #4659: panic: bug: removed more than added
+* #4680: Ignore pattern beginning with "#" does not match subpaths
+* #4689: Ignore patterns in web UI aren't reloaded if only comments change
+* #4701: Global is different from local state when ignoring files
+
+[1.0.2]
+* Update Syncthing to version 0.14.46
+
+[1.0.3]
+* Update Syncthing to version 0.14.47
+
+[1.0.4]
+* Update Syncthing to version 0.14.48
+
+[1.0.5]
+* Update Syncthing to 0.14.49
+
+[1.0.6]
+* Update Syncthign to 0.14.50
+
+[1.0.7]
+* Update Syncthing to 0.14.51
+
+[1.1.0]
+* Use latest base image
+
+[1.2.0]
+* Update Syncthing to 0.14.52
+
+[1.2.1]
+* Update Syncthing to 0.14.54
+
+[1.3.0]
+* Update Syncthing to 1.0.0
+* #2760: Option to limit max simultaneous scans
+* #5286: Add hardening options to systemd units
+* #5320: Show configured rate limit in the GUI
+* #5336: Show list of locally changed files for receive only folders
+
+[1.3.1]
+* Update Syncthing to 1.0.1
+
+[1.4.0]
+* Update Syncthing to 1.1.0
+
+[1.4.1]
+* Update Syncthign to 1.1.1
+
+[1.4.2]
+* Update Syncthing to 1.1.3
+
+[1.4.3]
+* Update Syncthing to 1.1.4
+
+[1.5.0]
+* Update Syncthing to 1.2.0
+
+[1.5.1]
+* Update Syncthing to 1.2.1
+
+[1.5.2]
+* Update Syncthing to 1.2.2
+
+[1.6.0]
+* Update Syncthing to 1.3.0
+
+[1.6.1]
+* Update Syncthing to 1.3.1
+
+[1.6.2]
+* Update Syncthing to 1.3.3
+
+[1.6.3]
+* Update Syncthing to 1.3.4
+
+[1.7.0]
+* Update Syncthing to 1.4.0
+
+[1.7.1]
+* Update Syncthing to 1.4.1
+
+[1.7.2]
+* Update Syncthing to 1.4.2
+

CloudronManifest.json

@@ -1,26 +1,25 @@
 {
-  "id": "net.syncthing.cloudronapp",
+  "id": "net.syncthing.cloudronapp2",
   "title": "Syncthing",
   "author": "Syncthing Developers",
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
   "tagline": "Decentralized file synchronization",
-  "version": "0.3.4",
-  "healthCheckPath": "/check",
+  "version": "1.7.2",
+  "healthCheckPath": "/healthcheck",
   "httpPort": 8000,
   "addons": {
-    "localstorage": {},
-    "ldap": {}
+    "localstorage": {}
   },
   "tcpPorts": {
-    "PORT": {
-      "title": "Port",
+    "SYNC_PORT": {
+      "title": "Sync Port",
       "description": "Port over which syncthing will exchange data (do not disable)",
       "defaultValue": 22000,
       "containerPort": 22000
     }
   },
-  "manifestVersion": 1,
+  "manifestVersion": 2,
   "website": "https://syncthing.net",
   "contactEmail": "support@cloudron.io",
   "icon": "logo.png",
@@ -28,8 +27,12 @@
     "storage",
     "sync"
   ],
+  "minBoxVersion": "4.1.4",
+  "documentationUrl": "https://cloudron.io/documentation/apps/syncthing/",
   "mediaLinks": [
-    "https://git.cloudron.io/dswd/syncthing-app/raw/master/screenshots/1.jpg"
+    "https://s3.amazonaws.com/cloudron-app-screenshots/net.syncthing.cloudronapp2/53bc9300d71bb5bf32362f8213194a0c3a415429/1.png",
+    "https://s3.amazonaws.com/cloudron-app-screenshots/net.syncthing.cloudronapp2/53bc9300d71bb5bf32362f8213194a0c3a415429/2.png",
+    "https://s3.amazonaws.com/cloudron-app-screenshots/net.syncthing.cloudronapp2/53bc9300d71bb5bf32362f8213194a0c3a415429/3.png"
   ],
   "postInstallMessage": "file://POSTINSTALL.md"
 }

DESCRIPTION.md

@@ -1,15 +1,17 @@
-This app packages Syncthing <upstream>v0.14.38</upstream>.
+This app packages Syncthing <upstream>1.4.2</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.
 
 ### Features
 
 #### Secure & Private
+
 - **Private.** None of your data is ever stored anywhere else other than on your computers. There is no central server that might be compromised, legally or illegally.
 - **Encrypted.** All communication is secured using TLS. The encryption used includes perfect forward secrecy to prevent any eavesdropper from ever gaining access to your data.
 - **Authenticated.** Every node is identified by a strong cryptographic certificate. Only nodes you have explicitly allowed can connect to your cluster.
 
 #### Easy to Use
+
 Syncthing is still in development, although a large number of features have already been implemented:
 
 - **Web GUI.** Configure and monitor Syncthing via a responsive and powerful interface accessible via your browser.
@@ -18,6 +20,7 @@ Syncthing is still in development, although a large number of features have alre
 - **Powerful.** Synchronize as many folders as you need with different people.
 
 #### Native GUIs & Integrations
+
 - **Windows** tray utility, filesystem watcher & launcher: [SyncTrayzor](https://github.com/canton7/SyncTrayzor/releases/latest)
 - **Cross-platform** GUI wrapper: [Syncthing-GTK](https://github.com/syncthing/syncthing-gtk/releases/latest)
 - **Android** app: [Syncthing App](https://f-droid.org/repository/browse/?fdid=com.nutomic.syncthingandroid)

Dockerfile

@@ -1,43 +1,17 @@
-FROM cloudron/base:0.10.0
-MAINTAINER Syncthing Developers <support@cloudron.io>
-
-EXPOSE 8000
-
-RUN apt-get update && apt-get -y install busybox
-
-ENV NGINX_VERSION=1.12.0
-ENV NGINX_LDAP_VERSION=b80942160417e95adbadb16adc41aaa19a6a00d9
-
-# Build a custom nginx with ldap support
-RUN apt-get remove -y nginx-full && apt-get autoremove -y && apt-get -y install libldap2-dev libpcre3-dev
-RUN mkdir -p /tmp/nginx-ldap
-WORKDIR /tmp/nginx-ldap
-RUN wget "https://github.com/kvspb/nginx-auth-ldap/archive/${NGINX_LDAP_VERSION}.tar.gz" -O - \
-    | tar -xz -C /tmp/nginx-ldap --strip-components=1
-
-RUN mkdir -p /tmp/nginx
-WORKDIR /tmp/nginx
-RUN wget "https://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz" -O - \
-    | tar -xz -C /tmp/nginx --strip-components=1
-RUN ./configure \
-    --add-dynamic-module=/tmp/nginx-ldap \
-    --modules-path=/usr/local/nginx/modules \
-    --conf-path=/app/code/nginx.conf \
-    --pid-path=/run/nginx.pid \
-    --error-log-path=/run/nginx.error.log \
-    --build=cloudron-river
-RUN make install
-
-ENV VERSION 0.14.38
+FROM cloudron/base:1.0.0@sha256:147a648a068a2e746644746bbfb42eb7a50d682437cead3c67c933c546357617
 
+ARG VERSION=1.4.2
 RUN mkdir -p /app/code \
     && wget https://github.com/syncthing/syncthing/releases/download/v${VERSION}/syncthing-linux-amd64-v${VERSION}.tar.gz -O - \
      | tar -xz -C /app/code --strip-components=1
 
 WORKDIR /app/code
 
+# add supervisor configs
+ADD supervisor/* /etc/supervisor/conf.d/
+RUN ln -sf /run/syncthing/supervisord.log /var/log/supervisor/supervisord.log
+
 ADD nginx.conf /app/code/nginx.conf
-ADD inittab /etc/inittab
 ADD start.sh /app/code/start.sh
 
 CMD [ "/app/code/start.sh" ]

LICENSE.txt

@@ -1,373 +0,0 @@
-Mozilla Public License Version 2.0
-==================================
-
-1. Definitions
---------------
-
-1.1. "Contributor"
-    means each individual or legal entity that creates, contributes to
-    the creation of, or owns Covered Software.
-
-1.2. "Contributor Version"
-    means the combination of the Contributions of others (if any) used
-    by a Contributor and that particular Contributor's Contribution.
-
-1.3. "Contribution"
-    means Covered Software of a particular Contributor.
-
-1.4. "Covered Software"
-    means Source Code Form to which the initial Contributor has attached
-    the notice in Exhibit A, the Executable Form of such Source Code
-    Form, and Modifications of such Source Code Form, in each case
-    including portions thereof.
-
-1.5. "Incompatible With Secondary Licenses"
-    means
-
-    (a) that the initial Contributor has attached the notice described
-        in Exhibit B to the Covered Software; or
-
-    (b) that the Covered Software was made available under the terms of
-        version 1.1 or earlier of the License, but not also under the
-        terms of a Secondary License.
-
-1.6. "Executable Form"
-    means any form of the work other than Source Code Form.
-
-1.7. "Larger Work"
-    means a work that combines Covered Software with other material, in
-    a separate file or files, that is not Covered Software.
-
-1.8. "License"
-    means this document.
-
-1.9. "Licensable"
-    means having the right to grant, to the maximum extent possible,
-    whether at the time of the initial grant or subsequently, any and
-    all of the rights conveyed by this License.
-
-1.10. "Modifications"
-    means any of the following:
-
-    (a) any file in Source Code Form that results from an addition to,
-        deletion from, or modification of the contents of Covered
-        Software; or
-
-    (b) any new file in Source Code Form that contains any Covered
-        Software.
-
-1.11. "Patent Claims" of a Contributor
-    means any patent claim(s), including without limitation, method,
-    process, and apparatus claims, in any patent Licensable by such
-    Contributor that would be infringed, but for the grant of the
-    License, by the making, using, selling, offering for sale, having
-    made, import, or transfer of either its Contributions or its
-    Contributor Version.
-
-1.12. "Secondary License"
-    means either the GNU General Public License, Version 2.0, the GNU
-    Lesser General Public License, Version 2.1, the GNU Affero General
-    Public License, Version 3.0, or any later versions of those
-    licenses.
-
-1.13. "Source Code Form"
-    means the form of the work preferred for making modifications.
-
-1.14. "You" (or "Your")
-    means an individual or a legal entity exercising rights under this
-    License. For legal entities, "You" includes any entity that
-    controls, is controlled by, or is under common control with You. For
-    purposes of this definition, "control" means (a) the power, direct
-    or indirect, to cause the direction or management of such entity,
-    whether by contract or otherwise, or (b) ownership of more than
-    fifty percent (50%) of the outstanding shares or beneficial
-    ownership of such entity.
-
-2. License Grants and Conditions
---------------------------------
-
-2.1. Grants
-
-Each Contributor hereby grants You a world-wide, royalty-free,
-non-exclusive license:
-
-(a) under intellectual property rights (other than patent or trademark)
-    Licensable by such Contributor to use, reproduce, make available,
-    modify, display, perform, distribute, and otherwise exploit its
-    Contributions, either on an unmodified basis, with Modifications, or
-    as part of a Larger Work; and
-
-(b) under Patent Claims of such Contributor to make, use, sell, offer
-    for sale, have made, import, and otherwise transfer either its
-    Contributions or its Contributor Version.
-
-2.2. Effective Date
-
-The licenses granted in Section 2.1 with respect to any Contribution
-become effective for each Contribution on the date the Contributor first
-distributes such Contribution.
-
-2.3. Limitations on Grant Scope
-
-The licenses granted in this Section 2 are the only rights granted under
-this License. No additional rights or licenses will be implied from the
-distribution or licensing of Covered Software under this License.
-Notwithstanding Section 2.1(b) above, no patent license is granted by a
-Contributor:
-
-(a) for any code that a Contributor has removed from Covered Software;
-    or
-
-(b) for infringements caused by: (i) Your and any other third party's
-    modifications of Covered Software, or (ii) the combination of its
-    Contributions with other software (except as part of its Contributor
-    Version); or
-
-(c) under Patent Claims infringed by Covered Software in the absence of
-    its Contributions.
-
-This License does not grant any rights in the trademarks, service marks,
-or logos of any Contributor (except as may be necessary to comply with
-the notice requirements in Section 3.4).
-
-2.4. Subsequent Licenses
-
-No Contributor makes additional grants as a result of Your choice to
-distribute the Covered Software under a subsequent version of this
-License (see Section 10.2) or under the terms of a Secondary License (if
-permitted under the terms of Section 3.3).
-
-2.5. Representation
-
-Each Contributor represents that the Contributor believes its
-Contributions are its original creation(s) or it has sufficient rights
-to grant the rights to its Contributions conveyed by this License.
-
-2.6. Fair Use
-
-This License is not intended to limit any rights You have under
-applicable copyright doctrines of fair use, fair dealing, or other
-equivalents.
-
-2.7. Conditions
-
-Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
-in Section 2.1.
-
-3. Responsibilities
--------------------
-
-3.1. Distribution of Source Form
-
-All distribution of Covered Software in Source Code Form, including any
-Modifications that You create or to which You contribute, must be under
-the terms of this License. You must inform recipients that the Source
-Code Form of the Covered Software is governed by the terms of this
-License, and how they can obtain a copy of this License. You may not
-attempt to alter or restrict the recipients' rights in the Source Code
-Form.
-
-3.2. Distribution of Executable Form
-
-If You distribute Covered Software in Executable Form then:
-
-(a) such Covered Software must also be made available in Source Code
-    Form, as described in Section 3.1, and You must inform recipients of
-    the Executable Form how they can obtain a copy of such Source Code
-    Form by reasonable means in a timely manner, at a charge no more
-    than the cost of distribution to the recipient; and
-
-(b) You may distribute such Executable Form under the terms of this
-    License, or sublicense it under different terms, provided that the
-    license for the Executable Form does not attempt to limit or alter
-    the recipients' rights in the Source Code Form under this License.
-
-3.3. Distribution of a Larger Work
-
-You may create and distribute a Larger Work under terms of Your choice,
-provided that You also comply with the requirements of this License for
-the Covered Software. If the Larger Work is a combination of Covered
-Software with a work governed by one or more Secondary Licenses, and the
-Covered Software is not Incompatible With Secondary Licenses, this
-License permits You to additionally distribute such Covered Software
-under the terms of such Secondary License(s), so that the recipient of
-the Larger Work may, at their option, further distribute the Covered
-Software under the terms of either this License or such Secondary
-License(s).
-
-3.4. Notices
-
-You may not remove or alter the substance of any license notices
-(including copyright notices, patent notices, disclaimers of warranty,
-or limitations of liability) contained within the Source Code Form of
-the Covered Software, except that You may alter any license notices to
-the extent required to remedy known factual inaccuracies.
-
-3.5. Application of Additional Terms
-
-You may choose to offer, and to charge a fee for, warranty, support,
-indemnity or liability obligations to one or more recipients of Covered
-Software. However, You may do so only on Your own behalf, and not on
-behalf of any Contributor. You must make it absolutely clear that any
-such warranty, support, indemnity, or liability obligation is offered by
-You alone, and You hereby agree to indemnify every Contributor for any
-liability incurred by such Contributor as a result of warranty, support,
-indemnity or liability terms You offer. You may include additional
-disclaimers of warranty and limitations of liability specific to any
-jurisdiction.
-
-4. Inability to Comply Due to Statute or Regulation
----------------------------------------------------
-
-If it is impossible for You to comply with any of the terms of this
-License with respect to some or all of the Covered Software due to
-statute, judicial order, or regulation then You must: (a) comply with
-the terms of this License to the maximum extent possible; and (b)
-describe the limitations and the code they affect. Such description must
-be placed in a text file included with all distributions of the Covered
-Software under this License. Except to the extent prohibited by statute
-or regulation, such description must be sufficiently detailed for a
-recipient of ordinary skill to be able to understand it.
-
-5. Termination
---------------
-
-5.1. The rights granted under this License will terminate automatically
-if You fail to comply with any of its terms. However, if You become
-compliant, then the rights granted under this License from a particular
-Contributor are reinstated (a) provisionally, unless and until such
-Contributor explicitly and finally terminates Your grants, and (b) on an
-ongoing basis, if such Contributor fails to notify You of the
-non-compliance by some reasonable means prior to 60 days after You have
-come back into compliance. Moreover, Your grants from a particular
-Contributor are reinstated on an ongoing basis if such Contributor
-notifies You of the non-compliance by some reasonable means, this is the
-first time You have received notice of non-compliance with this License
-from such Contributor, and You become compliant prior to 30 days after
-Your receipt of the notice.
-
-5.2. If You initiate litigation against any entity by asserting a patent
-infringement claim (excluding declaratory judgment actions,
-counter-claims, and cross-claims) alleging that a Contributor Version
-directly or indirectly infringes any patent, then the rights granted to
-You by any and all Contributors for the Covered Software under Section
-2.1 of this License shall terminate.
-
-5.3. In the event of termination under Sections 5.1 or 5.2 above, all
-end user license agreements (excluding distributors and resellers) which
-have been validly granted by You or Your distributors under this License
-prior to termination shall survive termination.
-
-************************************************************************
-*                                                                      *
-*  6. Disclaimer of Warranty                                           *
-*  -------------------------                                           *
-*                                                                      *
-*  Covered Software is provided under this License on an "as is"       *
-*  basis, without warranty of any kind, either expressed, implied, or  *
-*  statutory, including, without limitation, warranties that the       *
-*  Covered Software is free of defects, merchantable, fit for a        *
-*  particular purpose or non-infringing. The entire risk as to the     *
-*  quality and performance of the Covered Software is with You.        *
-*  Should any Covered Software prove defective in any respect, You     *
-*  (not any Contributor) assume the cost of any necessary servicing,   *
-*  repair, or correction. This disclaimer of warranty constitutes an   *
-*  essential part of this License. No use of any Covered Software is   *
-*  authorized under this License except under this disclaimer.         *
-*                                                                      *
-************************************************************************
-
-************************************************************************
-*                                                                      *
-*  7. Limitation of Liability                                          *
-*  --------------------------                                          *
-*                                                                      *
-*  Under no circumstances and under no legal theory, whether tort      *
-*  (including negligence), contract, or otherwise, shall any           *
-*  Contributor, or anyone who distributes Covered Software as          *
-*  permitted above, be liable to You for any direct, indirect,         *
-*  special, incidental, or consequential damages of any character      *
-*  including, without limitation, damages for lost profits, loss of    *
-*  goodwill, work stoppage, computer failure or malfunction, or any    *
-*  and all other commercial damages or losses, even if such party      *
-*  shall have been informed of the possibility of such damages. This   *
-*  limitation of liability shall not apply to liability for death or   *
-*  personal injury resulting from such party's negligence to the       *
-*  extent applicable law prohibits such limitation. Some               *
-*  jurisdictions do not allow the exclusion or limitation of           *
-*  incidental or consequential damages, so this exclusion and          *
-*  limitation may not apply to You.                                    *
-*                                                                      *
-************************************************************************
-
-8. Litigation
--------------
-
-Any litigation relating to this License may be brought only in the
-courts of a jurisdiction where the defendant maintains its principal
-place of business and such litigation shall be governed by laws of that
-jurisdiction, without reference to its conflict-of-law provisions.
-Nothing in this Section shall prevent a party's ability to bring
-cross-claims or counter-claims.
-
-9. Miscellaneous
-----------------
-
-This License represents the complete agreement concerning the subject
-matter hereof. If any provision of this License is held to be
-unenforceable, such provision shall be reformed only to the extent
-necessary to make it enforceable. Any law or regulation which provides
-that the language of a contract shall be construed against the drafter
-shall not be used to construe this License against a Contributor.
-
-10. Versions of the License
----------------------------
-
-10.1. New Versions
-
-Mozilla Foundation is the license steward. Except as provided in Section
-10.3, no one other than the license steward has the right to modify or
-publish new versions of this License. Each version will be given a
-distinguishing version number.
-
-10.2. Effect of New Versions
-
-You may distribute the Covered Software under the terms of the version
-of the License under which You originally received the Covered Software,
-or under the terms of any subsequent version published by the license
-steward.
-
-10.3. Modified Versions
-
-If you create software not governed by this License, and you want to
-create a new license for such software, you may create and use a
-modified version of this License if you rename the license and remove
-any references to the name of the license steward (except to note that
-such modified license differs from this License).
-
-10.4. Distributing Source Code Form that is Incompatible With Secondary
-Licenses
-
-If You choose to distribute Source Code Form that is Incompatible With
-Secondary Licenses under the terms of this version of the License, the
-notice described in Exhibit B of this License must be attached.
-
-Exhibit A - Source Code Form License Notice
--------------------------------------------
-
-  This Source Code Form is subject to the terms of the Mozilla Public
-  License, v. 2.0. If a copy of the MPL was not distributed with this
-  file, You can obtain one at https://mozilla.org/MPL/2.0/.
-
-If it is not possible or desirable to put the notice in a particular
-file, then You may include the notice in a location (such as a LICENSE
-file in a relevant directory) where a recipient would be likely to look
-for such a notice.
-
-You may add additional accurate notices of copyright ownership.
-
-Exhibit B - "Incompatible With Secondary Licenses" Notice
----------------------------------------------------------
-
-  This Source Code Form is "Incompatible With Secondary Licenses", as
-  defined by the Mozilla Public License, v. 2.0.

POSTINSTALL.md

@@ -1,9 +1,8 @@
-This application integrates with Cloudron authentication.
-However, all Cloudron users share the same Syncthing session.
-Please note that only the username is accepted as login and not the email address.
+Use the following credentials for initial setup:
 
-Syncthing contains an internal user `admin` that is needed by Cloudron but not exposed. 
-Please do not change the password of that account.
+`username`: admin
 
-Please create all sync folders as subfolders of `/app/data` as this is the only writable folder.
+`password`: changeme
+
+**Please change the admin password on first login**
 

inittab

@@ -1,2 +0,0 @@
-::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

nginx.conf

@@ -1,5 +1,4 @@
 user cloudron;
-load_module "/usr/local/nginx/modules/ngx_http_auth_ldap_module.so";
 
 worker_processes 1;
 pid /run/nginx.pid;
@@ -8,14 +7,11 @@ daemon  off;
 # Send logs to stderr
 error_log /dev/stderr warn;
 
-
 events {
     worker_connections 768;
 }
 
 http {
-    include /run/ldap.conf;    
-
     error_log /dev/stderr warn;
     log_format simple '$remote_addr [$time_local] "$request" $status $body_bytes_sent "$http_referer"';
     access_log /dev/stdout simple;
@@ -28,22 +24,18 @@ http {
     proxy_buffering off;
     proxy_cache_path /tmp/proxy_cache levels=1:2 keys_zone=my_cache:10m max_size=100m inactive=60m use_temp_path=off;
     proxy_cache my_cache;
-    auth_ldap_cache_enabled on;
-    auth_ldap_cache_expiration_time 300000;
-    auth_ldap_cache_size 100;
 
     server {
         error_log /dev/stderr warn;
         listen 8000 default_server;
         server_name _;
         proxy_read_timeout 120s;
-        location /check {
-            proxy_pass http://localhost:3000/syncthing/app.js;
+        location /healthcheck {
+            return 200;
         }
         location / {
-	    auth_ldap "Forbidden";
-            auth_ldap_servers cloudron;
             proxy_pass http://localhost:3000;
         }
     }
 }
+

start.sh

@@ -2,32 +2,28 @@
 
 set -eu
 
-mkdir -p /app/data/config
-
-export STNODEFAULTFOLDER=1 STNOUPGRADE=1
+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"
-  /app/code/syncthing --generate="/app/data/config"
+if [[ ! -f /app/data/config/config.xml ]]; then
+    echo "=> Generating config"
+    STNODEFAULTFOLDER=1 /app/code/syncthing --generate="/app/data/config"
+
+    # The password value (changeme) was determined by reading config.xml and setting value in the GUI
+    # urAccepted is 0 for not decided, -1 for no reporting
+    xmlstarlet ed --inplace \
+        --subnode "//configuration/gui" -t elem -n user -v "admin" \
+        --subnode "//configuration/gui" -t elem -n password -v '$2a$10$93OsgwAMD4NcPFTpGDnuTORMMbj5dc1ZlYUPrQCcy1N/Bsy9scUvK' \
+        --update "//configuration/options/defaultFolderPath" -v '/app/data/folders' \
+        --update "//configuration/options/urAccepted" -v '-1' \
+        /app/data/config/config.xml
 fi
 
-cat >/run/ldap.conf <<EOF
-ldap_server cloudron {
-  url ${LDAP_URL}/${LDAP_USERS_BASE_DN}?username;
-  binddn ${LDAP_BIND_DN};
-  binddn_passwd ${LDAP_BIND_PASSWORD};
-  group_attribute ${LDAP_GROUPS_BASE_DN};
-  group_attribute_is_dn on;
-  require valid_user;
-}
-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,<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/config /app/data
-
-exec busybox init
+chown -R cloudron:cloudron /app/data /run/syncthing
 
+echo "Starting supervisor"
+exec /usr/bin/supervisord --configuration /etc/supervisor/supervisord.conf --nodaemon -i GitLab

supervisor/nginx.conf

@@ -0,0 +1,12 @@
+[program:nginx]
+priority=100
+directory=/tmp
+command=/usr/sbin/nginx -c /app/code/nginx.conf
+user=root
+autostart=true
+autorestart=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+

supervisor/syncthing.conf

@@ -0,0 +1,14 @@
+[program:syncthing]
+priority=20
+environment=HOME=/app/data/folders,STNOUPGRADE=1
+; -no-browser opens up the browser (for desktop app preumably)
+; auditfile "-" means log to stdout
+command=/app/code/syncthing -gui-address=127.0.0.1:3000 -home=/app/data/config -no-browser -auditfile=-
+user=cloudron
+autostart=true
+autorestart=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+

test/package.json

@@ -9,14 +9,14 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "ejs": "^2.4.2",
+    "chromedriver": "^80.0.2",
+    "ejs": "^3.0.2",
     "expect.js": "^0.3.1",
-    "mkdirp": "^0.5.1",
-    "mocha": "^2.5.3",
-    "rimraf": "^2.5.3",
-    "selenium-server-standalone-jar": "^2.53.1",
-    "selenium-webdriver": "^2.53.1",
-    "superagent": "^1.4.0",
-    "chromedriver": "^2.31.0"
+    "mkdirp": "^1.0.4",
+    "mocha": "^7.1.1",
+    "rimraf": "^3.0.2",
+    "selenium-server-standalone-jar": "^3.141.59",
+    "selenium-webdriver": "^3.6.0",
+    "superagent": "^5.2.2"
   }
 }

test/test.js

@@ -2,13 +2,18 @@
 
 'use strict';
 
+require('chromedriver');
+
 var execSync = require('child_process').execSync,
     expect = require('expect.js'),
+    superagent = require('superagent'),
     path = require('path'),
     webdriver = require('selenium-webdriver');
 
-var by = webdriver.By,
-    until = webdriver.until;
+var by = require('selenium-webdriver').By,
+    until = require('selenium-webdriver').until,
+    Key = require('selenium-webdriver').Key,
+    Builder = require('selenium-webdriver').Builder;
 
 var accessKey = 'admin',
     secretKey = 'secretkey';
@@ -19,17 +24,11 @@ var bucket_prefix = 'bucket',
 
 process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
 
-if (!process.env.USERNAME || !process.env.PASSWORD) {
-    console.log('USERNAME and PASSWORD env vars need to be set');
-    process.exit(1);
-}
-
 describe('Application life cycle test', function () {
     this.timeout(0);
 
-    var chrome = require('selenium-webdriver/chrome');
-    var server, browser = new chrome.Driver();
-    var username = process.env.USERNAME, password = process.env.PASSWORD;
+    var server, browser = new Builder().forBrowser('chrome').build();
+    var username = 'admin', password = 'changeme';
 
     before(function (done) {
         var seleniumJar= require('selenium-server-standalone-jar');
@@ -48,9 +47,14 @@ describe('Application life cycle test', function () {
 
     var LOCATION = 'test';
     var TEST_TIMEOUT = 30000;
+    var FOLDER = 'xmf'; // keep this small. long folder names fail in automation, not sure why
     var SYNC_PORT = 22001;
     var app;
 
+    function installApp() {
+        execSync('cloudron install --port-bindings SYNC_PORT=' + SYNC_PORT + ' --location ' + LOCATION, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
+    }
+
     function pageLoaded() {
         return browser.wait(until.titleMatches(/[0-9a-f]{12} \| Syncthing/), TEST_TIMEOUT);
     }
@@ -61,6 +65,14 @@ describe('Application life cycle test', function () {
         });
     }
 
+    function invalidPassword(callback) {
+        superagent.get('https://' + app.fqdn).auth(username, password + 'x').end(function (error, result) {
+            expect(result.status).to.eql(401);
+
+            callback();
+        });
+    }
+
     function loadPage(callback) {
         browser.manage().deleteAllCookies().then(function () {
             return browser.get('https://' + username + ':' + encodeURIComponent(password) + '@' + app.fqdn).then(function () {
@@ -74,45 +86,54 @@ describe('Application life cycle test', function () {
     }
 
     function addFolder(callback) {
-        pageLoaded().then(function() {
+        browser.get('https://' + app.fqdn).then(function () {
             return browser.findElement(by.css('[ng-click*=addFolder]')).click();
         }).then(function () {
             return visible(by.id('folderPath'));
-        }).then(function() {
-            return browser.findElement(by.id('folderLabel')).sendKeys('test');
         }).then(function () {
-	        return browser.findElement(by.id('folderPath')).sendKeys('/app/data/test');
+            return browser.sleep(4000); // wait more, not sure why this is needed
         }).then(function() {
-            //Clear and re-enter the folder to avoid race with auto-completion
-            return browser.findElement(by.id('folderPath')).clear();
-        }).then(function() {
-	        return browser.findElement(by.id('folderPath')).sendKeys('/app/data/test');
+            return browser.findElement(by.id('folderLabel')).sendKeys(FOLDER);
+        }).then(function () {
+            return browser.sleep(4000); // without this sometimes only part of the folder name gets through
         }).then(function() {
             return browser.findElement(by.css('[ng-click*=saveFolder]')).click();
         }).then(function() {
             return browser.wait(until.elementLocated(by.css('#folders .panel-status span[ng-switch-when=unshared]')), TEST_TIMEOUT);
+        }).then(function () {
+            return browser.sleep(4000);
         }).then(function() {
             callback();
         });
     }
 
+    function checkFolder(callback) {
+        browser.get('https://' + app.fqdn).then(function () {
+            return browser.wait(until.elementLocated(by.xpath(`//span[text()="${FOLDER}"]`)), TEST_TIMEOUT);
+        }).then(function () {   
+            callback();
+        });
+    }
+
     function removeFolder(callback) {
-        browser.get('https://' + username + ':' + encodeURIComponent(password) + '@' + app.fqdn).then(function () {
-            return browser.get('https://' + app.fqdn);
-        }).then(function () {
+        browser.get('https://' + app.fqdn).then(function () {
             return pageLoaded();
         }).then(function() {
             return browser.findElement(by.css('#folders button')).click();
         }).then(function () {
-            return browser.sleep(1000); //No way to check for visibility of angular-js components
+            return browser.sleep(3000); //No way to check for visibility of angular-js components
         }).then(function () {
             return browser.findElement(by.css('#folder-0 button[ng-click*=editFolder]')).click();
         }).then(function () {
-            return browser.sleep(1000); //No way to check for visibility of angular-js components
+            return browser.sleep(3000); //No way to check for visibility of angular-js components
+        }).then(function () {
+            return browser.findElement(by.xpath('//button[@data-target="#remove-folder-confirmation"]')).click();
+        }).then(function () {
+            return browser.sleep(3000); //No way to check for visibility of angular-js components
         }).then(function () {
             return browser.findElement(by.css('[ng-click*=deleteFolder]')).click();
         }).then(function () {
-            return browser.sleep(1000); //This needs to run for some time
+            return browser.sleep(3000); //This needs to run for some time
         }).then(function () {
             callback();
         });
@@ -122,9 +143,7 @@ describe('Application life cycle test', function () {
         execSync('cloudron build', { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
     });
 
-    it('install app', function () {
-        execSync('cloudron install --new --wait --port-bindings PORT=' + SYNC_PORT + ' --location ' + LOCATION, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
-    });
+    it('install app', installApp);
 
     it('can get app information', function () {
         var inspect = JSON.parse(execSync('cloudron inspect'));
@@ -134,9 +153,9 @@ describe('Application life cycle test', function () {
         expect(app).to.be.an('object');
     });
 
+    it('fails with invalid password', invalidPassword);
     it('can load page', loadPage);
     it('can add folder', addFolder);
-    it('can remove folder', removeFolder);
 
     it('backup app', function () {
         execSync('cloudron backup create --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
@@ -147,23 +166,38 @@ describe('Application life cycle test', function () {
     });
 
     it('can load page', loadPage);
-    it('can add folder', addFolder);
-    it('can remove folder', removeFolder);
+    it('can check folder', checkFolder);
 
     it('move to different location', function () {
         browser.manage().deleteAllCookies();
-        execSync('cloudron configure --wait --location ' + LOCATION + '2', { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
+        execSync('cloudron configure --location ' + LOCATION + '2', { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
         var inspect = JSON.parse(execSync('cloudron inspect'));
         app = inspect.apps.filter(function (a) { return a.location === LOCATION + '2'; })[0];
         expect(app).to.be.an('object');
     });
 
     it('can load page', loadPage);
-    it('can add folder', addFolder);
+    it('can check folder', checkFolder);
     it('can remove folder', removeFolder);
 
     it('uninstall app', function () {
         execSync('cloudron uninstall --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
     });
 
+    // test update
+    it('can install app', function () {
+        execSync('cloudron install --appstore-id net.syncthing.cloudronapp2 --location ' + LOCATION, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
+        var inspect = JSON.parse(execSync('cloudron inspect'));
+        app = inspect.apps.filter(function (a) { return a.location === LOCATION; })[0];
+        expect(app).to.be.an('object');
+    });
+    it('can load page', loadPage);
+    it('can add folder', addFolder);
+    it('can update', function () {
+        execSync('cloudron update --app ' + LOCATION, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
+    });
+    it('can check folder', checkFolder);
+    it('uninstall app', function () {
+        execSync('cloudron uninstall --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
+    });
 });