Fix empty OIDC config prevents fresh application from starting (#846)

* Fix master build

* use JSON for openid_connect_providers

* (hopefully) print errors to STDOUT

* set TERMINFO

* Upload built artifact before functional testing

* D'oh

* Revert logging change
This commit is contained in:
Jamil
2022-07-25 19:21:41 -07:00
committed by GitHub
parent 5218bd0404
commit f590364ecd
6 changed files with 10 additions and 10 deletions

View File

@@ -25,6 +25,7 @@ jobs:
needs: draft-release
env:
TELEMETRY_ENABLED: 'false'
TERMINFO: /usr/lib/terminfo
runs-on: ${{ matrix.platform }}
strategy:
# Failing fast breaks the Omnibus build cache because the job is
@@ -87,15 +88,15 @@ jobs:
sudo mkdir -p /opt/firezone
sudo chown -R $USER /opt/firezone
bin/omnibus build firezone
- name: Functional Test
run: |
.ci/functional_test.sh
- uses: actions/upload-artifact@v3
with:
name: firezone-${{ matrix.platform }}
path: |
omnibus/pkg/firezone*.deb
omnibus/pkg/firezone*.rpm
- name: Functional Test
run: |
.ci/functional_test.sh
- name: Cleanup
if: always()
run: |

View File

@@ -11,7 +11,7 @@ defmodule FzHttpWeb.ProxyHeaders do
def call(conn, _opts) do
conn
|> RemoteIp.call(HeaderHelpers.remote_ip_opts())
|> RemoteIp.call(RemoteIp.init(HeaderHelpers.remote_ip_opts()))
|> Plug.RewriteOn.call(rewrite_opts())
end

View File

@@ -87,7 +87,7 @@ config :fz_http,
default_admin_password: "firezone1234",
events_module: FzHttp.Events,
server_process_opts: [name: {:global, :fz_http_server}],
openid_connect_providers: [],
openid_connect_providers: "{}",
openid_connect: OpenIDConnect
config :fz_wall,

View File

@@ -58,9 +58,8 @@ services:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
POSTGRES_DB: firezone_dev
# when you want to connect db with a graphic tool, uncomment ports
# ports:
# - 5432:5432
ports:
- 5432:5432
networks:
- app

View File

@@ -121,7 +121,7 @@ Shown below is a complete listing of the configuration options available in
| `default['firezone']['phoenix']['log_rotation']['num_to_keep']` | Number of Firezone web application log files to keep. | `10` |
| `default['firezone']['phoenix']['crash_detection']['enabled']` | Enable or disable bringing down the Firezone web application when a crash is detected. | `true` |
| `default['firezone']['phoenix']['external_trusted_proxies']` | List of trusted reverse proxies formatted as an Array of IPs and/or CIDRs. | `[]` |
| `default['firezone']['phoenix']['clients']` | List of private network HTTP clients, formatted an Array of IPs and/or CIDRs. | `[]` |
| `default['firezone']['phoenix']['private_clients']` | List of private network HTTP clients, formatted an Array of IPs and/or CIDRs. | `[]` |
| `default['firezone']['wireguard']['enabled']` | Enable or disable bundled WireGuard management. | `true` |
| `default['firezone']['wireguard']['log_directory']` | Log directory for bundled WireGuard management. | `"#{node['firezone']['log_directory']}/wireguard"` |
| `default['firezone']['wireguard']['log_rotation']['file_maxbytes']` | WireGuard log file max size. | `104857600` |

View File

@@ -150,7 +150,7 @@ default['firezone']['authentication']['oidc'] = {}
# default['firezone']['phoenix']['private_clients'] below instead of here.
#
# If set to false Firezone will assume that it is not running behind a proxy
default['firezone']['external_trusted_proxies'] = []
default['firezone']['phoenix']['external_trusted_proxies'] = []
# An array of IPs that Firezone will assume are clients, and thus, not a trusted
# proxy for the purpose of determining the client's IP. By default the bundled