From 309d12426d5bfb51234df6242a23d4f22c5f3ce4 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Wed, 31 Oct 2018 00:48:31 +0100
Subject: [PATCH] Improve template for mbox imports

* Do not prevent sidekiq from running
* mbox import script has been renamed
---
 templates/import/mbox.template.yml | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/templates/import/mbox.template.yml b/templates/import/mbox.template.yml
index 972d199..40ec3ba 100644
--- a/templates/import/mbox.template.yml
+++ b/templates/import/mbox.template.yml
@@ -5,19 +5,6 @@ params:
 
 hooks:
   after_web_config:
-    - exec:
-        cd: /etc/service
-        cmd:
-          - rm -R unicorn
-          - rm -R nginx
-          - rm -R cron
-
-    - exec:
-        cd: /etc/runit/3.d
-        cmd:
-          - rm 01-nginx
-          - rm 02-unicorn
-
     - file:
         path: /usr/local/bin/import_mbox.sh
         chmod: "+x"
@@ -31,7 +18,7 @@ hooks:
           cd $home
           echo "The mbox import is starting..."
           echo
-          su discourse -c 'bundle exec ruby script/import_scripts/mbox-experimental.rb /shared/import/settings.yml'
+          su discourse -c 'bundle exec ruby script/import_scripts/mbox.rb /shared/import/settings.yml'
 
     - exec:
         cd: $home
-- 
2.25.1