refactor(redis): move redis_service to service.sls

diaspora/install.sls

@@ -22,10 +22,6 @@ diaspora_database_dependency:
 redis_package:
   pkg.installed:
     - name: {{ diaspora.redis_package }}
-
-redis_service:
-  service.running:
-    - name: {{ diaspora.redis_service }}
 {%- endif %}
 
 {% set home = diaspora.user.get('home', '/home/' + diaspora.user.username) -%}

diaspora/service.sls

@@ -31,6 +31,16 @@ include:
     - context:
         diaspora: {{ diaspora|json }}
 
+{%- if diaspora.install_redis %}
+redis_service:
+  service.running:
+    - name: {{ diaspora.redis_service }}
+    - require:
+      - pkg: redis_package
+    - require_in:
+      - service: diaspora_service
+{%- endif %}
+
 diaspora_sidekiq_service:
   service.enabled:
     - name: diaspora-sidekiq