From 2b06b17e7404aca94f3e6b79072b7f0a943116fa Mon Sep 17 00:00:00 2001 From: root Date: Tue, 13 Jul 2021 18:29:03 -0400 Subject: [PATCH] http://box/print CUPS administration (redirects to https) --- roles/cups/tasks/install.yml | 4 ++-- roles/cups/tasks/main.yml | 4 ++-- roles/cups/templates/cups.conf.j2 | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/roles/cups/tasks/install.yml b/roles/cups/tasks/install.yml index a4166bb08..46856c37f 100644 --- a/roles/cups/tasks/install.yml +++ b/roles/cups/tasks/install.yml @@ -1,5 +1,5 @@ -# ADMINISTER CUPS AT http://box/print/admin WITH USERNAME 'Admin' AND PASSWORD -# 'changeme' (OR ANY MEMBER OF LINUX GROUP 'lpadmin') AS SET UP BELOW... +# ADMINISTER CUPS AT http://box/print -- USERNAME 'Admin' & PASSWORD 'changeme' +# (OR ANY MEMBER OF LINUX GROUP 'lpadmin') AS SET UP BELOW... - name: Install 'cups' package diff --git a/roles/cups/tasks/main.yml b/roles/cups/tasks/main.yml index 301da4133..2c9531814 100644 --- a/roles/cups/tasks/main.yml +++ b/roles/cups/tasks/main.yml @@ -1,5 +1,5 @@ -# ADMINISTER CUPS AT http://box/print/admin WITH USERNAME 'Admin' AND PASSWORD -# 'changeme' (OR ANY MEMBER OF LINUX GROUP 'lpadmin') PER cups/tasks/install.yml +# ADMINISTER CUPS AT http://box/print -- USERNAME 'Admin' & PASSWORD 'changeme' +# (OR ANY MEMBER OF LINUX GROUP 'lpadmin') PER cups/tasks/install.yml # "How do i fail a task in Ansible if the variable contains a boolean value? diff --git a/roles/cups/templates/cups.conf.j2 b/roles/cups/templates/cups.conf.j2 index 7efd33266..abec5152d 100644 --- a/roles/cups/templates/cups.conf.j2 +++ b/roles/cups/templates/cups.conf.j2 @@ -1,5 +1,5 @@ -# ADMINISTER CUPS AT http://box/print/admin WITH USERNAME 'Admin' AND PASSWORD -# 'changeme' (OR ANY MEMBER OF LINUX GROUP 'lpadmin') PER cups/tasks/install.yml +# ADMINISTER CUPS AT http://box/print -- USERNAME 'Admin' & PASSWORD 'changeme' +# (OR ANY MEMBER OF LINUX GROUP 'lpadmin') PER cups/tasks/install.yml # 2021-07-13: Let's redirect to CUPS' own web server for now, as proxying @@ -21,7 +21,7 @@ location ~ ^/print(|/.*)$ { # '~' -> '~*' for case-insensitive regex return 301 http://localhost:631; } - return 301 http://$host:631; # Can work with 192.168.0.x & 10.8.0.y ETC + return 301 http://$host:631; # For 192.168.0.x, 172.18.96.1, 10.8.0.y ETC }