Skip to content

Commit

Permalink
Merge pull request #2042 from SUSE/for-deploy-7
Browse files Browse the repository at this point in the history
🤖: Update build recipes for SP7
  • Loading branch information
dirkmueller authored Nov 25, 2024
2 parents c3e430e + 39dd10c commit e223e7a
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 9 deletions.
1 change: 1 addition & 0 deletions cosign-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#!BuildTag: suse/cosign:%%cosign_version%%-%RELEASE%
#!BuildTag: suse/cosign:%%cosign_version%%
#!BuildTag: suse/cosign:2.4
#!BuildTag: suse/cosign:2
#!BuildName: suse-cosign-2.4
#!BuildVersion: 15.7.2.4
FROM bci/bci-micro:15.7 AS target
Expand Down
5 changes: 5 additions & 0 deletions cosign-image/cosign-image.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sun Nov 24 08:01:22 UTC 2024 - SUSE Update Bot <[email protected]>

- Add major version tag

-------------------------------------------------------------------
Wed Nov 13 13:40:39 UTC 2024 - SUSE Update Bot <[email protected]>

Expand Down
5 changes: 5 additions & 0 deletions pcp-image/pcp-image.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sun Nov 24 08:01:55 UTC 2024 - SUSE Update Bot <[email protected]>

- Fix spelling mistakes

-------------------------------------------------------------------
Thu Oct 31 16:12:00 UTC 2024 - SUSE Update Bot <[email protected]>

Expand Down
4 changes: 2 additions & 2 deletions pcp-image/pmproxy.conf.template
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ secure.enabled = true
#####################################################################
[discover]

# propogate archives from pmlogger(1) into Redis querying
# propagate archives from pmlogger(1) into Redis querying
enabled = true

# comma-separated metrics name (globs) to skip during discovery
Expand All @@ -63,7 +63,7 @@ enabled = true
count = 10

#####################################################################
## settings for fast, scalable time series quering via Redis
## settings for fast, scalable time series querying via Redis
[pmseries]
#####################################################################

Expand Down
14 changes: 7 additions & 7 deletions sac-postfix-image/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ In all examples, `podman` can be replaced directly with `docker`.
- `SMTP_PORT=587` The relayhost port.
- `SMTP_USERNAME` Username to authenticate with on the relayserver.
- `SMTP_PASSWORD` Password of the SMTP user, alternative `SMTP_PASSWORD_FILE` could be used to point to a file with the password
- `SMTP_NETWORKS` Comma seperated subnets who are allowed to use the relay. E.g. `SMTP_NETWORKS='xxx.xxx.xxx.xxx/xx, xxx.xxx.xxx.xxx/xx'`. 10.0.0.0/8, 172.16.0.0/12 and 192.168.0.0/16 are preset.
- `SMTP_NETWORKS` Comma separated subnets who are allowed to use the relay. E.g. `SMTP_NETWORKS='xxx.xxx.xxx.xxx/xx, xxx.xxx.xxx.xxx/xx'`. 10.0.0.0/8, 172.16.0.0/12 and 192.168.0.0/16 are preset.
- `INET_PROTOCOLS` The network interface protocols used for connections. Valid values are "all", "ipv4", "ipv6" or "ipv4,ipv6". The default value is "ipv4".
- `MASQUERADE_DOMAINS` Comma separated list of domains that must have their subdomain structure stripped off.
- `MYDESTINATION` List of domains for which mails are delivered locally instead of forwarding to another machine.
Expand All @@ -63,8 +63,8 @@ In all examples, `podman` can be replaced directly with `docker`.
### Virtual mailbox related variables
- `VIRTUAL_MBOX=[0|1]` Create virtual mail boxes in /var/spool/vmail owned by user vmail.
- `VMAIL_UID=5000` User ID and group ID of the vmail user for virtual domains and mailboxes.
- `VIRTUAL_DOMAINS=` Whitespace seperated list of virtual domains, will be written to `/etc/postfix/vhosts`.
- `VIRTUAL_USERS=` Whitespace seperated list of virtual users email addresses.
- `VIRTUAL_DOMAINS=` Whitespace separated list of virtual domains, will be written to `/etc/postfix/vhosts`.
- `VIRTUAL_USERS=` Whitespace separated list of virtual users email addresses.

### LDAP related variables
- `USE_LDAP=[0|1]` Use LDAP for virtual mail box user accounts.
Expand Down Expand Up @@ -98,13 +98,13 @@ environment variables, files or LDAP.

### Environment Variables

Beside the already mentioned environment variables, two futher variables
Beside the already mentioned environment variables, two further variables
define the virtual domains and the virtual users.
`VIRTUAL_DOMAINS="example.com example2.com example3.com"` is a whitespace
seperated list which can contain one or more virtual domains. For every
separated list which can contain one or more virtual domains. For every
domain, an own directory below `/var/spool/vmail` will be created.
`VIRTUAL_USERS="[email protected] [email protected] [email protected]"`
Whitespace seperated list of virtual users email addresses.
Whitespace separated list of virtual users email addresses.

The example call:
```sh
Expand Down Expand Up @@ -141,7 +141,7 @@ password `XXX`.
Instead of maintaining a long list of environment variables, the configuration
files could also be provided and mapped into /etc/postfix of the container.

`/etc/postfix/vhosts` contains the list of virtual domains seperated by
`/etc/postfix/vhosts` contains the list of virtual domains separated by
newlines:

```
Expand Down
5 changes: 5 additions & 0 deletions sac-postfix-image/sac-postfix-image.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sun Nov 24 08:01:55 UTC 2024 - SUSE Update Bot <[email protected]>

- Fix spelling mistakes

-------------------------------------------------------------------
Thu Oct 31 16:12:00 UTC 2024 - SUSE Update Bot <[email protected]>

Expand Down

0 comments on commit e223e7a

Please sign in to comment.