From 5514e42cd1944e26abc4f9dd0f777f9a7e82e1d8 Mon Sep 17 00:00:00 2001
From: Semen Bezrukov <semen.bezrukov@onlyoffice.com>
Date: Wed, 29 Apr 2020 15:37:15 +0300
Subject: [PATCH] Code refactoring

---
 .travis.yml   | 44 +++++++++++++++++++++++---------------------
 tests/test.sh |  2 +-
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8467317..cdefcc4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,29 @@ language: generic
 dist: trusty
 
 env:
+  # no certificates
+  - config: certs.yml
+
+  # certificates (default tls if onlyoffice not exists)
+  - config: certs.yml
+    ssl: true
+
+  # old certificates path (default onlyoffice if exists)
+  - config: certs.yml
+    ssl: true
+    private_key: onlyoffice.key
+    certificate_request: onlyoffice.csr
+    certificate: onlyoffice.crt
+
+  # custom certificates path
+  - config: certs.yml
+    ssl: true
+    private_key: mycert.key
+    certificate_request: mycert.csr
+    certificate: mycert.crt
+    SSL_CERTIFICATE_PATH: /var/www/onlyoffice/Data/certs/mycert.crt
+    SSL_KEY_PATH: /var/www/onlyoffice/Data/certs/mycert.key
+
   # postgresql
   - config: postgres.yml
 
@@ -14,27 +37,6 @@ env:
     POSTGRES_DB: mydb
     POSTGRES_USER: myuser
 
-  # no certificates
-  - config: certs.yml
-    ssl: false
-
-  # certificates (default tls if onlyoffice not exists)
-  - config: certs.yml
-
-  # old certificates path (default onlyoffice if exists)
-  - config: certs.yml
-    private_key: onlyoffice.key
-    certificate_request: onlyoffice.csr
-    certificate: onlyoffice.crt
-
-  # custom certificates path
-  - config: certs.yml
-    private_key: mycert.key
-    certificate_request: mycert.csr
-    certificate: mycert.crt
-    SSL_CERTIFICATE_PATH: /var/www/onlyoffice/Data/certs/mycert.crt
-    SSL_KEY_PATH: /var/www/onlyoffice/Data/certs/mycert.key
-
   # deprecated variables
   - config: postgres-old.yml
 
diff --git a/tests/test.sh b/tests/test.sh
index 01d8ea2..6028584 100755
--- a/tests/test.sh
+++ b/tests/test.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-ssl=${ssl:-true}
+ssl=${ssl:-false}
 private_key=${private_key:-tls.key}
 certificate_request=${certificate_request:-tls.csr}
 certificate=${certificate:-tls.crt}