From e8af7465971ebc3f1af060776ed11a1a0dce4ca7 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Wed, 28 Apr 2021 20:13:35 -0500 Subject: [PATCH] cups - drop apache The port is open anyway, just lose the /cups redirect, not worth dragging apache in. Still missing the nginx config to make apache work, nginx should really just use nginx directly. --- roles/cups/tasks/enable-or-disable.yml | 8 -------- roles/cups/tasks/install.yml | 16 ---------------- 2 files changed, 24 deletions(-) diff --git a/roles/cups/tasks/enable-or-disable.yml b/roles/cups/tasks/enable-or-disable.yml index 866536c97..74a9ee702 100644 --- a/roles/cups/tasks/enable-or-disable.yml +++ b/roles/cups/tasks/enable-or-disable.yml @@ -1,11 +1,3 @@ -- name: Enable http://box/cups via Apache (MIGHT NOT WORK?) - command: a2ensite cups.conf - when: cups_enabled - -- name: Disable http://box/cups via Apache - command: a2dissite cups.conf - when: not cups_enabled - - name: systemd daemon-reload systemd: daemon_reload: yes diff --git a/roles/cups/tasks/install.yml b/roles/cups/tasks/install.yml index dd17420ba..15630862e 100644 --- a/roles/cups/tasks/install.yml +++ b/roles/cups/tasks/install.yml @@ -1,13 +1,3 @@ -- name: "Set 'apache_install: True' and 'apache_enabled: True'" - set_fact: - apache_install: True - apache_enabled: True - -- name: APACHE - run 'httpd' role - include_role: - name: httpd - - - name: Install 'cups' package package: name: cups @@ -18,12 +8,6 @@ src: cupsd.conf dest: /etc/cups/cupsd.conf -- name: Install /etc/{{ apache_conf_dir }}/cups.conf from template - template: - src: cups.conf - dest: "/etc/{{ apache_conf_dir }}/" - - # RECORD CUPS AS INSTALLED - name: "Set 'cups_installed: True'"