Selaa lähdekoodia

Reintroduce nextcloud on the stable 11 branch

Bob Mottram 8 vuotta sitten
vanhempi
commit
cddd8f3c22
1 muutettua tiedostoa jossa 11 lisäystä ja 3 poistoa
  1. 11
    3
      src/freedombone-app-nextcloud

+ 11
- 3
src/freedombone-app-nextcloud Näytä tiedosto

@@ -30,16 +30,17 @@
30 30
 # You should have received a copy of the GNU Affero General Public License
31 31
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
32 32
 
33
-VARIANTS=''
33
+VARIANTS='full full-vim cloud'
34 34
 
35 35
 IN_DEFAULT_INSTALL=0
36
-SHOW_ON_ABOUT=0
36
+SHOW_ON_ABOUT=1
37 37
 
38 38
 NEXTCLOUD_DOMAIN_NAME=
39 39
 NEXTCLOUD_CODE=
40 40
 NEXTCLOUD_ONION_PORT=8112
41 41
 NEXTCLOUD_REPO="https://github.com/nextcloud/server"
42
-NEXTCLOUD_COMMIT='562c45d925a27b21f694a091029d87158364970c'
42
+# Stable 11 branch
43
+NEXTCLOUD_COMMIT='4fe02f6e3a812551661a3a7a7ceb4e1f3791cbd3'
43 44
 NEXTCLOUD_ADMIN_PASSWORD=
44 45
 
45 46
 nextcloud_variables=(ONION_ONLY
@@ -455,6 +456,13 @@ function install_nextcloud_main {
455 456
     function_check create_site_certificate
456 457
     create_site_certificate $NEXTCLOUD_DOMAIN_NAME 'yes'
457 458
 
459
+    if [[ $ONION_ONLY == "no" ]]; then
460
+        if [ ! -f /etc/ssl/certs/${NEXTCLOUD_DOMAIN_NAME}.pem ]; then
461
+            echo $'Certificate not generated for nextcloud'
462
+            exit 725762
463
+        fi
464
+    fi
465
+
458 466
     # Ensure that the database gets backed up locally, if remote
459 467
     # backups are not being used
460 468
     function_check backup_databases_script_header