Преглед на файлове

Check for install success

Bob Mottram преди 8 години
родител
ревизия
b5b9a1f04d
променени са 2 файла, в които са добавени 16 реда и са изтрити 9 реда
  1. 14
    7
      src/freedombone-app-ghost
  2. 2
    2
      src/freedombone-app-htmly

+ 14
- 7
src/freedombone-app-ghost Целия файл

284
     # for the avatar changing command
284
     # for the avatar changing command
285
     apt-get -yq install unzip wget
285
     apt-get -yq install unzip wget
286
 
286
 
287
-    function_check install_nodejs
288
-    install_nodejs ghost
289
-
290
     if [ ! -d /var/www/$GHOST_DOMAIN_NAME/htdocs ]; then
287
     if [ ! -d /var/www/$GHOST_DOMAIN_NAME/htdocs ]; then
291
         mkdir -p /var/www/$GHOST_DOMAIN_NAME/htdocs
288
         mkdir -p /var/www/$GHOST_DOMAIN_NAME/htdocs
292
     fi
289
     fi
301
         echo $'ghost failed to unzip'
298
         echo $'ghost failed to unzip'
302
         exit 63835
299
         exit 63835
303
     fi
300
     fi
301
+
302
+    function_check install_nodejs
303
+    install_nodejs ghost
304
+
305
+    ghost_create_config
304
     npm install --production
306
     npm install --production
307
+    if [ ! "$?" = "0" ]; then
308
+        function_check remove_nodejs
309
+        remove_nodejs ghost
310
+        echo $'Failed to install ghost'
311
+        exit 7383563
312
+    fi
305
 
313
 
306
     function_check install_mariadb
314
     function_check install_mariadb
307
     install_mariadb
315
     install_mariadb
311
 
319
 
312
     function_check ghost_create_database
320
     function_check ghost_create_database
313
     ghost_create_database
321
     ghost_create_database
314
-    ghost_create_config
315
 
322
 
316
-    adduser --system --home=/var/www/$GHOST_DOMAIN_NAME/htdocs/ --group ghost
317
-    chown -R ghost: /var/www/$GHOST_DOMAIN_NAME/htdocs/
323
+    adduser --system --home=/var/www/${GHOST_DOMAIN_NAME}/htdocs/ --group ghost
324
+    chown -R ghost: /var/www/${GHOST_DOMAIN_NAME}/htdocs/
318
 
325
 
319
     echo '[Unit]' > /etc/systemd/system/ghost.service
326
     echo '[Unit]' > /etc/systemd/system/ghost.service
320
     echo 'Description=Ghost Blog' >> /etc/systemd/system/ghost.service
327
     echo 'Description=Ghost Blog' >> /etc/systemd/system/ghost.service
327
     echo 'User=ghost' >> /etc/systemd/system/ghost.service
334
     echo 'User=ghost' >> /etc/systemd/system/ghost.service
328
     echo 'Group=ghost' >> /etc/systemd/system/ghost.service
335
     echo 'Group=ghost' >> /etc/systemd/system/ghost.service
329
     echo "WorkingDirectory=/var/www/${GHOST_DOMAIN_NAME}/htdocs" >> /etc/systemd/system/ghost.service
336
     echo "WorkingDirectory=/var/www/${GHOST_DOMAIN_NAME}/htdocs" >> /etc/systemd/system/ghost.service
330
-    echo "ExecStart=/usr/bin/node /var/www/${GHOST_DOMAIN_NAME}/htdocs/index.js" >> /etc/systemd/system/ghost.service
337
+    echo "ExecStart=/usr/local/bin/node /var/www/${GHOST_DOMAIN_NAME}/htdocs/index.js" >> /etc/systemd/system/ghost.service
331
     echo 'Restart=always' >> /etc/systemd/system/ghost.service
338
     echo 'Restart=always' >> /etc/systemd/system/ghost.service
332
     echo 'RestartSec=60' >> /etc/systemd/system/ghost.service
339
     echo 'RestartSec=60' >> /etc/systemd/system/ghost.service
333
     echo "Environment=NODE_ENV=production PORT=${GHOST_PORT}" >> /etc/systemd/system/ghost.service
340
     echo "Environment=NODE_ENV=production PORT=${GHOST_PORT}" >> /etc/systemd/system/ghost.service

+ 2
- 2
src/freedombone-app-htmly Целия файл

240
             fi
240
             fi
241
             set_user_permissions
241
             set_user_permissions
242
             backup_unmount_drive
242
             backup_unmount_drive
243
-            exit 593
243
+            exit 54675
244
         fi
244
         fi
245
         rm -rf ${temp_restore_dir}
245
         rm -rf ${temp_restore_dir}
246
         if [ ! -d /var/www/${HTMLY_DOMAIN_NAME}/htdocs/content ]; then
246
         if [ ! -d /var/www/${HTMLY_DOMAIN_NAME}/htdocs/content ]; then
247
             echo $"No content directory found after restoring htmly"
247
             echo $"No content directory found after restoring htmly"
248
             set_user_permissions
248
             set_user_permissions
249
             backup_unmount_drive
249
             backup_unmount_drive
250
-            exit 287
250
+            exit 34578
251
         fi
251
         fi
252
         chown -R www-data:www-data /var/www/${HTMLY_DOMAIN_NAME}/htdocs
252
         chown -R www-data:www-data /var/www/${HTMLY_DOMAIN_NAME}/htdocs
253
         # Ensure that the bundled SSL cert is being used
253
         # Ensure that the bundled SSL cert is being used