Add support for Debian 10 / Ubuntu 20.04 #135
Conversation
| @@ -15,15 +15,16 @@ platforms: | |||
| - name: amazonlinux | |||
| driver_config: | |||
| box: mvbcoding/awslinux | |||
| - name: centos-6 | |||
| - name: amazonlinux-2 | |||
| - name: centos-7 | |||
There was a problem hiding this comment.
Might want to shove centos 8 in here while you're in the file
There was a problem hiding this comment.
Converge is failing on Centos 8 - squid itself is starting and working but there's something to do with docker and systemd and squid being dumb that's causing the service start to timeout. It passes in vbox.
| @@ -104,6 +104,8 @@ | |||
| command "#{node['squid']['package']} -Nz" | |||
| action :run | |||
| creates ::File.join(node['squid']['cache_dir'], '00') | |||
| notifies :stop, "service[#{squid_service_name}]", :before | |||
There was a problem hiding this comment.
Before is pretty fragile and entirely broken in things like why-run. If there's a way to do it without this that'd be great
There was a problem hiding this comment.
The other idea would be to drop initialization entirely since on at least debian the init script will create it if it doesn't exist. But I don't know if that's true across the board.
There was a problem hiding this comment.
On the upside, :before is doing the trick and all tests are passing and there is some precedence for using it within this codebase.
| @@ -5,6 +5,12 @@ | |||
| it { should be_listening } | |||
| end | |||
|
|
|||
| cache_dir = os[:linux?] ? '/var/spool/squid' : '/var/squid/cache' | |||
There was a problem hiding this comment.
Did you meant to have linux? inside the os hash?
There was a problem hiding this comment.
Can do os.linux? if that's more idiomatic. Both work.
There was a problem hiding this comment.
Switched to os.linux? for better readability.
|
Should I add a |
|
@eheydrick you are correct on the changelog, please add an entry under the heading We haven't done a release since the new system came in, so the bot won't have set things up properly yet. |
Also drop testing on EOL OS's and add testing on Centos 8 Signed-off-by: Eric Heydrick <eheydrick@gmail.com>
eheydrick
force-pushed
the
fix_cache_init
branch
from
c614f46
to
3bedd70
Compare
|
@xorima CHANGELOG entry added and also squashed. |
xorima
added
the
Release: Minor
|
Anything else needed here or ready to merge? |
|
just need @tas50 to have a look over it :) |
|
I trust @eheydrick knows what he's doing. He's been reviewing my work for years |
|
Released as: 4.4.0 |
Description
The problem is cache initialization cannot run while squid is running. Older versions of squid silently failed but the version in Debian 10 / Ubuntu 20.04 returns an error. To solve this we stop squid before running cache init.
Also drop support for EOL OS's and add support for new ones.
Issues Resolved
Fixes #134 .
Check List