Skip to content

feat/proxy-initial-trust-as-root #206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stevius10 merged 4 commits into from
Oct 29, 2025
Merged

feat/proxy-initial-trust-as-root #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cf6fca1
set permissions accordingly
stevius10 Oct 29, 2025
e6d9005
trust as root initially
stevius10 Oct 29, 2025
816bae1
use attribute internal for local network range
stevius10 Oct 29, 2025
a78f945
prepare internal access
stevius10 Oct 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion base/roles/base/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@
include_tasks: state.yml
vars:
extra:
- { path: "/app/.ssh", state: "directory", mode: "0755", owner: "app", group: "config" }
- { path: "/app", state: "directory", mode: "0755", owner: "app", group: "config" }
- { path: "/app/.ssh", state: "directory", mode: "0711", owner: "app", group: "config" }
- { path: "{{ key_dir }}", state: "directory", mode: "0711", owner: "app", group: "config" }
- { path: "{{ cert_dir }}", state: "directory", mode: "0711", owner: "app", group: "config" }

Expand Down
25 changes: 13 additions & 12 deletions libs/proxy/attributes/default.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
default['ip'] = ENV['IP']
default['ip'] = ENV['IP']

default['app']['user'] = Default.user(node)
default['app']['group'] = Default.group(node)
default['app']['user'] = Default.user(node)
default['app']['group'] = Default.group(node)

default['proxy']['dir']['app'] = '/app/proxy'
default['proxy']['dir']['certs'] = '/share/.certs'
default['proxy']['dir']['caddy'] = "#{node['proxy']['dir']['certs']}/caddy"
default['proxy']['dir']['config'] = '/app/proxy/conf.d'
default['proxy']['dir']['logs'] = '/app/proxy/logs'
default['proxy']['dir']['app'] = '/app/proxy'
default['proxy']['dir']['certs'] = '/share/.certs'
default['proxy']['dir']['caddy'] = "#{node['proxy']['dir']['certs']}/caddy"
default['proxy']['dir']['config'] = '/app/proxy/conf.d'
default['proxy']['dir']['logs'] = '/app/proxy/logs'

default['proxy']['config']['domain'] = 'l'
default['proxy']['config']['domain'] = 'l'
default['proxy']['config']['internal'] = '192.168.178.0/24'

default['proxy']['logs']['roll_size'] = '2MiB'
default['proxy']['logs']['roll_keep'] = '7'
default['proxy']['logs']['roll_for'] = '24h'
default['proxy']['logs']['roll_size'] = '2MiB'
default['proxy']['logs']['roll_keep'] = '7'
default['proxy']['logs']['roll_for'] = '24h'
18 changes: 14 additions & 4 deletions libs/proxy/recipes/default.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
owner node['app']['user']
group node['app']['group']
mode '0644'
variables( hosts: lazy { node.run_state['proxy_hosts'] || [] },
caddy_dir: node['proxy']['dir']['caddy'], config_dir: node['proxy']['dir']['config'],
log_dir: node['proxy']['dir']['logs'], logs_roll_size: node['proxy']['logs']['roll_size'],
variables( hosts: lazy { node.run_state['proxy_hosts'] || [] }, config_dir: node['proxy']['dir']['config'],
caddy_dir: node['proxy']['dir']['caddy'], log_dir: node['proxy']['dir']['logs'],
internal: node['proxy']['config']['internal'], logs_roll_size: node['proxy']['logs']['roll_size'],
logs_roll_keep: node['proxy']['logs']['roll_keep'], logs_roll_for: node['proxy']['logs']['roll_for'] )
end

Expand All @@ -35,8 +35,18 @@
files_mode '0664'
end

execute "#{self.cookbook_name}_initialize" do
command "/bin/caddy trust --config #{node['proxy']['dir']['app']}/Caddyfile"
user 'root'
timeout 120
not_if { ::File.directory?("#{node['proxy']['dir']['caddy']}/certificates") ||
::File.directory?("#{node['proxy']['dir']['caddy']}/pki") }
subscribes :run, "template[#{node['proxy']['dir']['app']}/Caddyfile]", :immediately
action :nothing
end

ruby_block "#{self.cookbook_name}_application" do block do
Common.application(self, cookbook_name,
Common.application(self, cookbook_name, actions: [:start, :enable],
exec: "/bin/caddy run --config #{node['proxy']['dir']['app']}/Caddyfile",
subscribe: ["template[#{node['proxy']['dir']['app']}/Caddyfile]", "remote_directory[#{node['proxy']['dir']['config']}]"],
unit: { 'Service' => { 'AmbientCapabilities' => 'CAP_NET_BIND_SERVICE' } } )
Expand Down
10 changes: 8 additions & 2 deletions libs/proxy/templates/Caddyfile.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
}

(internal) {
@internal remote_ip 192.168.178.0/24
@external not remote_ip 192.168.178.0/24
@internal remote_ip <%= @internal %>
@external not remote_ip <%= @internal %>
respond @external "Forbidden" 403
}

Expand Down Expand Up @@ -51,6 +51,12 @@
tls internal

import <%= @config_dir %>/*<%= hostname %>.caddy

route {
reverse_proxy @internal <%= upstream %> {
trusted_proxies <%= @internal %>
}
}
}
<% end -%>

Expand Down