Skip to content

Commit 1879491

Browse files
authored
Manual backport: 1152 to v24 (#1168)
resolves conflicts
1 parent 33733dd commit 1879491

File tree

5 files changed

+4
-89
lines changed

5 files changed

+4
-89
lines changed

content/docs/capabilities/authorization.mdx

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
# cSpell:ignore abac gset
2+
# cSpell:ignore abac, gset, nxon
33

44
title: Authorization & Policy
55
lang: en-US
@@ -93,9 +93,9 @@ In this example, only a user with the email `[email protected]` can access the ta
9393

9494
In the Enterprise Console, you can use the **EDITOR** to manually configure policy with PPL:
9595

96-
![Build policy with PPL in Console](./img/authorization/ppl-editor-policy.png)
96+
![Build an authorization policy with PPL in the Enterprise Console](./img/authorization/ppl-edit-policy.png)
9797

98-
In this example, a user will have access if their email address ends in `example.com` and they are a member of the `admin` group. The user will be denied access on Saturdays and Sundays.
98+
In this example, Pomerium will grant a user access if their email address ends in `example.com` and their `groups` ID matches `00gso9nxonHI4YfbM4x6`. Pomerium will deny the user access on Saturdays and Sundays.
9999

100100
</TabItem>
101101
</Tabs>
Loading
Binary file not shown.

content/docs/deploy/k8s/reference.md

-85
Original file line numberDiff line numberDiff line change
@@ -641,91 +641,6 @@ Postgres specifies PostgreSQL database connection parameters
641641
</tbody>
642642
</table>
643643

644-
### `redis`
645-
646-
Redis defines REDIS connection parameters
647-
648-
<table>
649-
<thead>
650-
</thead>
651-
<tbody>
652-
653-
<tr>
654-
<td>
655-
<p>
656-
<code>caSecret</code>&#160;&#160;
657-
658-
<strong>string</strong>&#160;
659-
(namespace/name)
660-
661-
</p>
662-
<p>
663-
664-
CASecret should refer to a k8s secret with key <code>ca.crt</code> that must be a PEM-encoded certificate authority to use when connecting to the databroker storage engine.
665-
</p>
666-
667-
Format: reference to Kubernetes resource with namespace prefix: <code>namespace/name</code> format.
668-
669-
</td>
670-
</tr>
671-
672-
<tr>
673-
<td>
674-
<p>
675-
<code>secret</code>&#160;&#160;
676-
677-
<strong>string</strong>&#160;
678-
(namespace/name)
679-
680-
</p>
681-
<p>
682-
<strong>Required.</strong>&#160;
683-
Secret specifies a name of a Secret that must contain <code>connection</code> key.
684-
</p>
685-
686-
Format: reference to Kubernetes resource with namespace prefix: <code>namespace/name</code> format.
687-
688-
</td>
689-
</tr>
690-
691-
<tr>
692-
<td>
693-
<p>
694-
<code>tlsSecret</code>&#160;&#160;
695-
696-
<strong>string</strong>&#160;
697-
(namespace/name)
698-
699-
</p>
700-
<p>
701-
702-
TLSSecret should refer to a k8s secret of type <code>kubernetes.io/tls</code> that would be used to perform TLS connection to REDIS.
703-
</p>
704-
705-
Format: reference to Kubernetes resource with namespace prefix: <code>namespace/name</code> format.
706-
707-
</td>
708-
</tr>
709-
710-
<tr>
711-
<td>
712-
<p>
713-
<code>tlsSkipVerify</code>&#160;&#160;
714-
715-
<strong>boolean</strong>&#160;
716-
717-
</p>
718-
<p>
719-
720-
TLSSkipVerify disables TLS certificate chain validation.
721-
</p>
722-
723-
</td>
724-
</tr>
725-
726-
</tbody>
727-
</table>
728-
729644
### `refreshDirectory`
730645

731646
RefreshDirectory is no longer supported, please see <a href="https://docs.pomerium.com/docs/overview/upgrading#idp-directory-sync">Upgrade Guide</a>.

src/components/Newsletter.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ const CustomFormFooter = ({status, message, onValidated}) => {
8181
height: 48,
8282
border: 'none',
8383
borderRadius: '25px',
84-
cursor: 'pointer'
84+
cursor: 'pointer',
8585
}}
8686
className="top-0 right-0 bottom-0 w-12 flex hover:text-purple"
8787
onClick={submit}>

0 commit comments

Comments
 (0)