From 9fabb7b90311080cdf42a409189a4254909f5ba2 Mon Sep 17 00:00:00 2001
From: James Valleroy <jvalleroy@mailbox.org>
Date: Sat, 29 Jul 2017 15:38:06 -0400
Subject: [PATCH] diaspora: Don't enable service until domain name is set

 - This avoids an issue where it would try to enable the apache conf
possibly before it is generated.

- Added an explicit enable statement since it was missing.

Reviewed-by: Joseph Nuthalpati <njoseph@thoughtworks.com>
---
 actions/diaspora                    |  6 +++---
 plinth/modules/diaspora/__init__.py | 10 +++++++---
 plinth/modules/diaspora/views.py    |  5 +----
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/actions/diaspora b/actions/diaspora
index c2207f91c..21ed764b9 100755
--- a/actions/diaspora
+++ b/actions/diaspora
@@ -62,7 +62,6 @@ def subcommand_setup(arguments):
         dnf.write(domain_name)
     set_domain_name(domain_name)
     uncomment_user_registrations()
-    action_utils.service_start('diaspora')
     action_utils.webserver_enable('diaspora-plinth')
 
 
@@ -86,9 +85,10 @@ def set_domain_name(domain_name):
             'http://{}:3000'.format(domain_name))
     aug.save()
 
-    diaspora.generate_apache_configuration('/etc/apache2/conf-available/diaspora-plinth.conf',
-                                           domain_name)
+    diaspora.generate_apache_configuration(
+        '/etc/apache2/conf-available/diaspora-plinth.conf', domain_name)
 
+    action_utils.service_enable('diaspora')
     action_utils.service_start('diaspora')
 
 
diff --git a/plinth/modules/diaspora/__init__.py b/plinth/modules/diaspora/__init__.py
index a89caa187..05aa76fcc 100644
--- a/plinth/modules/diaspora/__init__.py
+++ b/plinth/modules/diaspora/__init__.py
@@ -97,7 +97,11 @@ def setup(helper, old_version=None):
     helper.install(managed_packages)
     helper.call('custom_config', actions.superuser_run, 'diaspora',
                 ['disable-ssl'])
-    helper.call('post', actions.superuser_run, 'diaspora', ['enable'])
+
+
+def setup_domain_name(domain_name):
+    actions.superuser_run('diaspora',
+                          ['setup', '--domain-name', domain_name])
     global service
     if service is None:
         service = service_module.Service(
@@ -108,8 +112,8 @@ def setup(helper, old_version=None):
             is_enabled=is_enabled,
             enable=enable,
             disable=disable)
-    helper.call('post', service.notify_enabled, None, True)
-    helper.call('post', add_shortcut)
+    service.notify_enabled(None, True)
+    add_shortcut()
 
 
 def add_shortcut():
diff --git a/plinth/modules/diaspora/views.py b/plinth/modules/diaspora/views.py
index 70278ab16..6bae74136 100644
--- a/plinth/modules/diaspora/views.py
+++ b/plinth/modules/diaspora/views.py
@@ -24,7 +24,6 @@ from django.urls import reverse_lazy
 from django.utils.translation import ugettext as _
 from django.views.generic import FormView
 
-from plinth import actions
 from plinth.forms import DomainSelectionForm
 from plinth.modules import diaspora
 from plinth.utils import get_domain_names
@@ -43,9 +42,7 @@ class DiasporaSetupView(FormView):
 
     def form_valid(self, form):
         domain_name = form.cleaned_data['domain_name']
-        actions.superuser_run('diaspora',
-                              ['setup', '--domain-name', domain_name])
-        diaspora.add_shortcut()
+        diaspora.setup_domain_name(domain_name)
 
         return super().form_valid(form)