simplify roles organization and renames

roles/celerity/tasks/main.yml

@@ -40,4 +40,6 @@
   include_role:
     name: ferm
 
+- meta: flush_handlers
+
 ...

roles/conf/defaults/main.yml

@@ -10,7 +10,7 @@ conf_repo_url: https://mirismanager.ubicast.eu/git/mediaserver/envsetup.git
 conf_repo_version: stable
 conf_repo_dest: /root/envsetup
 
-conf_host: "{{ skyreach_host | default('panel.ubicast.eu', true) }}"
+conf_host: "{{ skyreach_host | default('mirismanager.ubicast.eu', true) }}"
 conf_valid_cert: "{{ skyreach_valid_cert | default(true, true) }}"
 
 skyreach_activation_key: "{{ lookup('env', 'SKYREACH_ACTIVATION_KEY') }}"

roles/conf/tasks/main.yml

 ---
 
 - name: proxy
+  when:
+    - proxy_http | d()
+    - proxy_https | d()
   include_role:
     name: proxy
 

roles/init/defaults/main.yml

@@ -4,5 +4,6 @@ init_packages:
   - apt-utils
   - gnupg
   - ssh-client
+  - sudo
 
 ...

roles/locale/tasks/main.yml

@@ -3,6 +3,7 @@
 - name: install locale packages
   apt:
     force_apt_get: true
+    install_recommends: false
     name: "{{ locale_packages }}"
 
 - name: generate locale
@@ -14,9 +15,9 @@
   copy:
     dest: /etc/default/locale
     content: |
-      LANG="{{ init_locale }}"
-      LANGUAGE="{{ init_locale }}"
-      LC_ALL="{{ init_locale }}"
+      LANG={{ init_locale }}
+      LANGUAGE={{ init_locale }}
+      LC_ALL={{ init_locale }}
 
 - name: set locale.gen
   notify: update locale

roles/logs/defaults/main.yml

+---
+
+logs_packages:
+  - rsyslog
+
+...

roles/logs/tasks/main.yml

+---
+
+- name: install logs packages
+  apt:
+    force_apt_get: true
+    install_recommends: false
+    name: "{{ logs_packages }}"
+
+- name: start rsyslog
+  systemd:
+    name: rsyslog
+    enabled: true
+    state: started
+
+- name: ensure journald logs persistence is enabled
+  file:
+    path: /var/log/journal
+    state: directory
+
+...

roles/manager/defaults/main.yml

----
-
-manager_packages:
-  - ubicast-skyreach
-  - ubicast-skyreach-runtime
-
-manager_testing: false
-manager_mail: dev-mediaserver@ubicast.eu
-manager_hostname: "{{ envsetup_cm_server_name }}"
-manager_default_email_sender: "noreply@{{ manager_hostname }}"
-manager_email_sender: "{{ envsetup_email_sender | default(manager_default_email_sender, true) }}"
-manager_proxy_http: "{{ envsetup_proxy_http }}"
-
-manager_fail2ban_enabled: "{{ envsetup_fail2ban_enabled | d(true) }}"
-manager_f2b_filter:
-  name: manager
-  content: |
-    [INCLUDES]
-    before = common.conf
-    [Definition]
-    failregex = INFO Wrong credentials given to login\. IP: <HOST>, username: \S+\.$
-                INFO Wrong crendentials given to login\. IP: <HOST>, username: \S+\.$
-    ignoreregex =
-manager_f2b_jail:
-  name: manager
-  content: |
-    [manager]
-    logpath = /home/skyreach/.skyreach/logs/skyreach.log
-    enabled = {% if manager_fail2ban_enabled | bool %}true{% else %}false{% endif %}
-
-manager_firewall_enabled: true
-manager_ferm_rules_filename: manager
-manager_ferm_input_rules:
-  - proto:
-      - tcp
-    dport:
-      - 80
-      - 443
-  - saddr: "{{ groups['all'] | map('extract', hostvars, ['ansible_default_ipv4', 'address']) | list }}"
-    proto:
-      - tcp
-    dport:
-      - 3142
-manager_ferm_output_rules: []
-manager_ferm_global_settings:
-
-...

roles/mediaimport/meta/main.yml

+---
+
+dependencies:
+  - role: base
+
+...

roles/import/tasks/main.yml → roles/mediaimport/tasks/main.yml

@@ -174,4 +174,6 @@
   include_role:
     name: ferm
 
+- meta: flush_handlers
+
 ...