Browse Source

Remove special cases for Debian Jessie.

Signed-off-by: Maximilian Wilhelm <max@sdn.clinic>
Maximilian Wilhelm 4 years ago
parent
commit
b522c0478f
3 changed files with 1 additions and 8 deletions
  1. 0 3
      gogs/init.sls
  2. 0 3
      nginx/init.sls
  3. 1 2
      postfix/init.sls

+ 0 - 3
gogs/init.sls

@@ -16,9 +16,6 @@ gogs-repo:
 postgresql:
   pkg.installed:
     - name: postgresql
-  {% if grains.oscodename == "jessie" %}
-    - fromrepo: jessie-backports
-  {% endif %}
 
   service.running:
     - name: postgresql

+ 0 - 3
nginx/init.sls

@@ -9,9 +9,6 @@
 nginx:
   pkg.installed:
     - name: {{nginx_pkg}}
-{% if grains.oscodename in ['jessie'] %}
-    - fromrepo: {{ grains.oscodename }}-backports
-{% endif %}
   service.running:
     - enable: TRUE
     - reload: TRUE

+ 1 - 2
postfix/init.sls

@@ -2,12 +2,11 @@
 # Postfix
 #
 
-# Force installation of bsd-mailx as it's not installed anymore in Debian Jessie..
+# Make sure 'mail' is present
 bsd-mailx:
   pkg.installed:
     - name: bsd-mailx
 
-
 postfix:
   pkg.installed:
     - name: postfix