Skip to content

Commit 0a90e58

Browse files
committed
splitting keycloak out
Signed-off-by: Ryan Cook <rcook@redhat.com>
1 parent 5218292 commit 0a90e58

File tree

3 files changed

+36
-4
lines changed

3 files changed

+36
-4
lines changed

roles/sigstore_scaffolding/defaults/main.yml

+7-2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ sigstore_trillian_templates:
2828
- manifests/trillian/trillian-logserver.yaml
2929
- manifests/trillian/trillian-logsigner.yaml
3030

31+
ctlog_enabled: true
32+
tuf_enabled: true
33+
34+
trillian_enabled: true
3135
trillian:
3236
mysql:
3337
user: mysql
@@ -74,7 +78,7 @@ remote_ctlog_public_key: "{{ certs_dir }}/{{ ctlog_public_key_filename }}"
7478
remote_rekor_signer: "{{ certs_dir }}/{{ rekor_signer_filename }}"
7579
remote_rekor_public_key: "{{ certs_dir }}/{{ rekor_public_key_filename }}"
7680

77-
81+
rekor_enabled: true
7882
rekor_public_key_retries: 5
7983
rekor_public_key_delay: 10
8084
fulcio_server_config: "{{ kube_configmap_dir }}/fulcio-config.yaml"
@@ -90,6 +94,7 @@ keycloak_certs_config: "{{ kube_configmap_dir }}/keycloak-certs.yaml"
9094
setup_host_dns: true
9195
base_hostname: ""
9296

97+
fulcio_enabled: true
9398
fulcio_ca_passphrase: sigstore
9499
ctlog_ca_passphrase: sigstore
95100
rekor_ca_passphrase: sigstore
@@ -134,4 +139,4 @@ trillian_db_image: gcr.io/trillian-opensource-ci/db_server@sha256:22b7fddcb4bafc
134139
tuf_image: quay.io/rcook/tuf/server:latest
135140
netcat_image: quay.io/rcook/netcat:v1.0.0
136141
nginx_image: registry.access.redhat.com/ubi8/nginx-120@sha256:0d4543b4cf26eb46b1632006cc5b24a1925336973eb3ec17cdfb9fec372da5b8
137-
curl_image: registry.access.redhat.com/ubi9/ubi-minimal:latest
142+
curl_image: registry.access.redhat.com/ubi9/ubi-minimal:latest

roles/sigstore_scaffolding/tasks/podman.yml

+7-1
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,24 @@
2424

2525
- name: Configure/Deploy Trillian
2626
ansible.builtin.include_tasks: podman/trillian.yml
27+
when: trillian_enabled | bool
2728

2829
- name: Setup Trillian Tree ID
2930
ansible.builtin.include_tasks: podman/createtree.yml
31+
when: trillian_enabled | bool
3032

3133
- name: Configure/Deploy Rekor
3234
ansible.builtin.include_tasks: podman/rekor.yml
35+
when: rekor_enabled | bool
3336

3437
- name: Configure/Deploy Fulcio
3538
ansible.builtin.include_tasks: podman/fulcio.yml
39+
when: fulcio_enabled | bool
3640

3741
- name: Configure/Deploy ctlog
3842
ansible.builtin.include_tasks: podman/ctlog.yml
43+
when: ctlog_enabled | bool
3944

4045
- name: Configure/Deploy tuf
41-
ansible.builtin.include_tasks: podman/tuf.yml
46+
ansible.builtin.include_tasks: podman/tuf.yml
47+
when: tuf_enabled | bool

roles/sigstore_scaffolding/templates/configs/nginx.conf.j2

+22-1
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@ events {
1010
worker_connections 1024;
1111
}
1212

13-
1413
http {
14+
map_hash_bucket_size 128;
15+
map_hash_max_size 128;
16+
server_names_hash_bucket_size 128;
1517
include /etc/nginx/mime.types;
1618
default_type application/octet-stream;
1719

@@ -41,28 +43,47 @@ http {
4143

4244
stream {
4345

46+
map_hash_bucket_size 128;
4447
map $ssl_server_name $targetBackend {
48+
{% if rekor_enabled %}
4549
rekor.{{ base_hostname }} rekor-server-pod:3000;
50+
{% endif %}
51+
{% if tuf_enabled %}
4652
tuf.{{ base_hostname }} tuf-pod:8080;
53+
{% endif %}
54+
{% if fulcio_enabled %}
4755
fulcio.{{ base_hostname }} fulcio-server-pod:5555;
56+
{% endif %}
4857
{% if keycloak_enabled %}
4958
{{ keycloak_url }} keycloak:8080;
5059
{% endif %}
5160
}
5261

5362
map $ssl_server_name $targetCert {
63+
{% if rekor_enabled %}
5464
rekor.{{ base_hostname }} /certs/ingress-rekor.pem;
65+
{% endif %}
66+
{% if tuf_enabled %}
5567
tuf.{{ base_hostname }} /certs/ingress-tuf.pem;
68+
{% endif %}
69+
{% if fulcio_enabled %}
5670
fulcio.{{ base_hostname }} /certs/ingress-fulcio.pem;
71+
{% endif %}
5772
{% if keycloak_enabled %}
5873
{{ keycloak_url }} /certs/ingress-keycloak.pem;
5974
{% endif %}
6075
}
6176

6277
map $ssl_server_name $targetCertKey {
78+
{% if rekor_enabled %}
6379
rekor.{{ base_hostname }} /certs/ingress-rekor.key;
80+
{% endif %}
81+
{% if tuf_enabled %}
6482
tuf.{{ base_hostname }} /certs/ingress-tuf.key;
83+
{% endif %}
84+
{% if fulcio_enabled %}
6585
fulcio.{{ base_hostname }} /certs/ingress-fulcio.key;
86+
{% endif %}
6687
{% if keycloak_enabled %}
6788
{{ keycloak_url }} /certs/ingress-keycloak.key;
6889
{% endif %}

0 commit comments

Comments
 (0)