Parcourir la source

Check for install success

Bob Mottram il y a 8 ans
Parent
révision
b5b9a1f04d
2 fichiers modifiés avec 16 ajouts et 9 suppressions
  1. 14
    7
      src/freedombone-app-ghost
  2. 2
    2
      src/freedombone-app-htmly

+ 14
- 7
src/freedombone-app-ghost Voir le fichier

@@ -284,9 +284,6 @@ function install_ghost {
284 284
     # for the avatar changing command
285 285
     apt-get -yq install unzip wget
286 286
 
287
-    function_check install_nodejs
288
-    install_nodejs ghost
289
-
290 287
     if [ ! -d /var/www/$GHOST_DOMAIN_NAME/htdocs ]; then
291 288
         mkdir -p /var/www/$GHOST_DOMAIN_NAME/htdocs
292 289
     fi
@@ -301,7 +298,18 @@ function install_ghost {
301 298
         echo $'ghost failed to unzip'
302 299
         exit 63835
303 300
     fi
301
+
302
+    function_check install_nodejs
303
+    install_nodejs ghost
304
+
305
+    ghost_create_config
304 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 314
     function_check install_mariadb
307 315
     install_mariadb
@@ -311,10 +319,9 @@ function install_ghost {
311 319
 
312 320
     function_check ghost_create_database
313 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 326
     echo '[Unit]' > /etc/systemd/system/ghost.service
320 327
     echo 'Description=Ghost Blog' >> /etc/systemd/system/ghost.service
@@ -327,7 +334,7 @@ function install_ghost {
327 334
     echo 'User=ghost' >> /etc/systemd/system/ghost.service
328 335
     echo 'Group=ghost' >> /etc/systemd/system/ghost.service
329 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 338
     echo 'Restart=always' >> /etc/systemd/system/ghost.service
332 339
     echo 'RestartSec=60' >> /etc/systemd/system/ghost.service
333 340
     echo "Environment=NODE_ENV=production PORT=${GHOST_PORT}" >> /etc/systemd/system/ghost.service

+ 2
- 2
src/freedombone-app-htmly Voir le fichier

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