Skip to content

Commit 464dfe4

Browse files
authored
Merge pull request #74 from OpenVoxProject/modulesync
chore: Modulesync (05f52f6)
2 parents 1020d99 + 4c7ed53 commit 464dfe4

File tree

8 files changed

+62
-21
lines changed

8 files changed

+62
-21
lines changed

.github/workflows/labeler.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@ name: 🏷️ Pull Request Labeler
77
on:
88
- pull_request_target
99

10+
permissions:
11+
contents: read
12+
1013
jobs:
1114
labeler:
1215
name: Labeler
1316
permissions:
14-
contents: read
1517
pull-requests: write
1618
uses: voxpupuli/crafty/.github/workflows/labeler.yml@main
1719
with:

.github/workflows/markdownlint.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: Markdown Lint
3+
4+
on:
5+
pull_request:
6+
branches:
7+
- main
8+
workflow_dispatch:
9+
10+
permissions:
11+
contents: read
12+
13+
jobs:
14+
markdown-lint:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: actions/checkout@v5
18+
- uses: DavidAnson/markdownlint-cli2-action@v20
19+
with:
20+
globs: '**/*.md'

.github/workflows/release.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,11 @@ on:
1010
- '*'
1111

1212
permissions:
13-
contents: read # minimal required permissions to clone repo
13+
contents: read
1414

1515
jobs:
1616
release:
1717
name: Release
18-
permissions:
19-
contents: write
2018
uses: voxpupuli/crafty/.github/workflows/release.yml@main
2119
with:
2220
allowed_owner: openvoxproject

.markdownlint-cli2.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
---
2+
# Managed by modulesync - DO NOT EDIT
3+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
4+
5+
ignores:
6+
- .github/**
7+
- .idea/**
8+
- .vendor/**
9+
- .vscode/**
10+
- CHANGELOG.md
11+
- test/**
12+
- vendor/**

.markdownlint.yaml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
1+
---
2+
# Managed by modulesync - DO NOT EDIT
3+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
4+
15
default: true
2-
MD033:
6+
7+
line-length:
8+
line_length: 210
9+
10+
no-inline-html:
311
allowed_elements:
412
- br
5-
MD013:
6-
line_length: 210
13+
14+
descriptive-link-text: false

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,13 @@ The following environment variables are supported:
9494
| Name | Usage / Default |
9595
|---------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------|
9696
| __AUTOSIGN__ | Whether or not to enable autosigning on the openvoxserver instance. Valid values are `true`, `false`, and `/path/to/autosign.conf`.<br><br>Defaults to `true`. |
97-
| __CA_ALLOW_SUBJECT_ALT_NAMES__ | Whether or not SSL certificates containing Subject Alternative Names should be signed by the CA. Does nothing unless `CA_ENABLED=true`.<br><br>Defaults to `false` |
97+
| __CA_ALLOW_SUBJECT_ALT_NAMES__ | Whether or not SSL certificates containing Subject Alternative Names should be signed by the CA. Does nothing unless `CA_ENABLED=true`.<br><br>Defaults to `false` | <!-- markdownlint-disable-line -->
9898
| __CA_ENABLED__ | Whether or not this openvoxserver instance has a running CA (Certificate Authority)<br><br>Defaults to `true` |
9999
| __CA_HOSTNAME__ | The DNS hostname for the openvoxserver running the CA. Does nothing unless `CA_ENABLED=false`<br><br>Defaults to `puppet` |
100100
| __CA_PORT__ | The listening port of the CA. Does nothing unless `CA_ENABLED=false`<br><br>Defaults to `8140` |
101101
| __CA_TTL__ | CA expire date (in seconds or with suffix `s`, `m`, `h`, `d`, `y`)<br><br>Defaults to `157680000` |
102102
| __CERTNAME__ | The DNS name used on the servers SSL certificate - sets the `certname` in puppet.conf<br><br>Defaults to unset. |
103-
| __CSR_ATTRIBUTES__ | Provide a JSON string of the csr_attributes.yaml content. e.g. `CSR_ATTRIBUTES='{"custom_attributes": { "challengePassword": "foobar" }, "extension_requests": { "pp_project": "foo" } }'`<br><br> Defaults to empty JSON object `{}`<br> Please note that within a compose file, you must provide all environment variables as Hash and not as Array!<br> environment:<br> `CSR_ATTRIBUTES: '{"extension_request": {...}}'` |
103+
| __CSR_ATTRIBUTES__ | Provide a JSON string of the csr_attributes.yaml content. e.g. `CSR_ATTRIBUTES='{"custom_attributes": { "challengePassword": "foobar" }, "extension_requests": { "pp_project": "foo" } }'`<br><br> Defaults to empty JSON object `{}`<br> Please note that within a compose file, you must provide all environment variables as Hash and not as Array!<br> environment:<br> `CSR_ATTRIBUTES: '{"extension_request": {...}}'` | <!-- markdownlint-disable-line -->
104104
| __DNS_ALT_NAMES__ | Additional DNS names to add to the servers SSL certificate<br>__Note__ only effective on initial run when certificates are generated |
105105
| __ENVIRONMENTPATH__ | Set an environmentpath<br><br> Defaults to `/etc/puppetlabs/code/environments` |
106106
| __HIERACONFIG__ | Set a hiera_config entry in puppet.conf file<br><br> Defaults to `$confdir/hiera.yaml` |
@@ -111,18 +111,18 @@ The following environment variables are supported:
111111
| __OPENVOX_REPORTS__ | Sets `reports` in puppet.conf<br><br>Defaults to `puppetdb` |
112112
| __OPENVOX_STORECONFIGS__ | Sets `storeconfigs` in puppet.conf<br><br>Defaults to `true` |
113113
| __OPENVOX_STORECONFIGS_BACKEND__ | Sets `storeconfigs_backend` in puppet.conf<br><br>Defaults to `puppetdb` |
114-
| __OPENVOXDB_SERVER_URLS__ | The URL of the OpenVoxDB servers. This is used to connect to the OpenVoxDB server. <br><br> Defaults to `https://openvoxdb:8081`<br> Please note that within a compose file, you must provide all environment variables as Hash and not as Array!<br> environment:<br> `OPENVOXDB_SERVER_URLS: 'https://openvoxdb:8081'` |
114+
| __OPENVOXDB_SERVER_URLS__ | The URL of the OpenVoxDB servers. This is used to connect to the OpenVoxDB server. <br><br> Defaults to `https://openvoxdb:8081`<br> Please note that within a compose file, you must provide all environment variables as Hash and not as Array!<br> environment:<br> `OPENVOXDB_SERVER_URLS: 'https://openvoxdb:8081'` | <!-- markdownlint-disable-line -->
115115
| __OPENVOXSERVER_ENABLE_ENV_CACHE_DEL_API__ | Enable the puppet admin api endpoint via certificates to allow clearing environment caches<br><br> Defaults to `true` |
116116
| __OPENVOXSERVER_ENVIRONMENT_TIMEOUT__ | Configure the environment timeout<br><br> Defaults to `unlimited` |
117117
| __OPENVOXSERVER_GRAPHITE_EXPORTER_ENABLED__ | Activate the graphite exporter. Also needs __OPENVOXSERVER_GRAPHITE_HOST__ and __OPENVOXSERVER_GRAPHITE_PORT__<br><br> Defaults to `false` |
118-
| __OPENVOXSERVER_GRAPHITE_HOST__ | Only used if __OPENVOXSERVER_GRAPHITE_EXPORTER_ENABLED__ is set to `true`. FQDN or Hostname of the graphite server where puppet should push metrics to. <br><br> Defaults to `exporter` |
119-
| __OPENVOXSERVER_GRAPHITE_PORT__ | Only used if __OPENVOXSERVER_GRAPHITE_EXPORTER_ENABLED__ is set to `true`. Port of the graphite server where puppet should push metrics to. <br><br> Default to `9109` |
118+
| __OPENVOXSERVER_GRAPHITE_HOST__ | Only used if __OPENVOXSERVER_GRAPHITE_EXPORTER_ENABLED__ is set to `true`. FQDN or Hostname of the graphite server where puppet should push metrics to. <br><br> Defaults to `exporter` | <!-- markdownlint-disable-line -->
119+
| __OPENVOXSERVER_GRAPHITE_PORT__ | Only used if __OPENVOXSERVER_GRAPHITE_EXPORTER_ENABLED__ is set to `true`. Port of the graphite server where puppet should push metrics to. <br><br> Default to `9109` | <!-- markdownlint-disable-line -->
120120
| __OPENVOXSERVER_HOSTNAME__ | The DNS name used on the servers SSL certificate - sets the `server` in puppet.conf<br><br>Defaults to unset. |
121121
| __OPENVOXSERVER_JAVA_ARGS__ | Arguments passed directly to the JVM when starting the service<br><br>Defaults to `-Xms1024m -Xmx1024m` |
122122
| __OPENVOXSERVER_MAX_ACTIVE_INSTANCES__ | The maximum number of JRuby instances allowed<br><br>Defaults to `1` |
123123
| __OPENVOXSERVER_MAX_REQUESTS_PER_INSTANCE__ | The maximum HTTP requests a JRuby instance will handle in its lifetime (disable instance flushing)<br><br>Defaults to `0` |
124124
| __OPENVOXSERVER_PORT__ | The port of the openvoxserver<br><br>Defaults to `8140` |
125-
| __USE_OPENVOXDB__ | Whether to connect to puppetdb <br>Sets `OPENVOX_REPORTS` to `log` and `OPENVOX_STORECONFIGS` to `false` if `OPENVOX_STORECONFIGS_BACKEND` is `puppetdb`. <br><br>Defaults to `true`|
125+
| __USE_OPENVOXDB__ | Whether to connect to puppetdb <br>Sets `OPENVOX_REPORTS` to `log` and `OPENVOX_STORECONFIGS` to `false` if `OPENVOX_STORECONFIGS_BACKEND` is `puppetdb`. <br><br>Defaults to `true`| <!-- markdownlint-disable-line -->
126126

127127
## Initialization Scripts
128128

RELEASE.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
<!-- Managed by modulesync - DO NOT EDIT -->
2+
<!-- https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ -->
13
# Release
24

35
## On a fork

renovate.json

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,31 @@
77
{
88
"customType": "regex",
99
"datasourceTemplate": "rubygems",
10-
"fileMatch": [
11-
"build_versions.yaml"
10+
"managerFilePatterns": [
11+
"/build_versions.yaml/"
1212
],
1313
"matchStrings": [
14-
"rubygem_(?<depName>[a-z0-9_]+):\\s+'(?<currentValue>\\d+\\.\\d+\\.\\d+)'"
14+
"rubygem_(?<depName>[a-z0-9_-]+):\\s+'(?<currentValue>\\d+\\.\\d+\\.\\d+)'"
1515
]
1616
},
1717
{
1818
"customType": "regex",
1919
"datasourceTemplate": "deb",
20-
"fileMatch": [
21-
"build_versions.yaml"
20+
"managerFilePatterns": [
21+
"/build_versions.yaml/"
2222
],
2323
"matchStrings": [
2424
"#\\s*renovate:\\s*depName=(?<depName>.*?)\\s*openVoxRelease=(?<openVoxRelease>\\d+)\\s*\\n\\s*(?<key>\\w+_version):\\s*\"(?<currentValue>.*?)\""
2525
],
26-
"registryUrlTemplate": "https://apt.overlookinfratech.com?suite=ubuntu24.04&components=openvox{{openVoxRelease}}&binaryArch=amd64"
26+
"registryUrlTemplate": "https://apt.voxpupuli.org?suite=ubuntu24.04&components=openvox{{openVoxRelease}}&binaryArch=amd64"
2727
}
2828
],
2929
"extends": [
3030
"config:recommended"
3131
],
3232
"addLabels": [
3333
"dependencies",
34-
"renovate",
35-
"github_actions"
34+
"renovate"
3635
],
3736
"vulnerabilityAlerts": {
3837
"enabled": true,

0 commit comments

Comments
 (0)