kunsi/bundlewrap
1
0
Fork 0
Code Issues 1 Pull requests 1 Releases Activity

rename some gitea stuff to forgejo

Browse source
This commit is contained in:
Franzi 2023-01-29 09:42:36 +01:00
parent a8e2e6b5ad
commit f6b0c587d0
Signed by: kunsi
GPG key ID: 12E3D2136B818350
3 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
PORT_MAP.md
View file

@ -36,7 +36,7 @@ Rule of thumb: keep ports below 10000 free for stuff that reserves ports.
| 20090 | matrix-media-repo | prometheus metrics | | 20090 | matrix-media-repo | prometheus metrics |
| 21000 | pleroma | pleroma | | 21000 | pleroma | pleroma |
| 21010 | grafana | grafana | | 21010 | grafana | grafana |
| 22000 | gitea | gitea | | 22000 | gitea | forgejo |
| 22010 | jenkins-ci | Jenkins CI | | 22010 | jenkins-ci | Jenkins CI |
| 22020 | travelynx | Travelynx Web | | 22020 | travelynx | Travelynx Web |
| 22030 | octoprint | OctoPrint Web Interface | | 22030 | octoprint | OctoPrint Web Interface |

11
bundles/gitea/metadata.py
View file

@ -6,7 +6,7 @@ defaults = {
}, },
}, },
'gitea': { 'gitea': {
'app_name': 'Gitea', 'app_name': 'Forgejo',
'database': { 'database': {
'username': 'gitea', 'username': 'gitea',
'password': repo.vault.password_for('{} postgresql gitea'.format(node.name)), 'password': repo.vault.password_for('{} postgresql gitea'.format(node.name)),
@ -23,7 +23,7 @@ defaults = {
'icinga2_api': { 'icinga2_api': {
'gitea': { 'gitea': {
'services': { 'services': {
'GITEA PROCESS': { 'FORGEJO PROCESS': {
'command_on_monitored_host': '/usr/local/share/icinga/plugins/check_systemd_unit gitea', 'command_on_monitored_host': '/usr/local/share/icinga/plugins/check_systemd_unit gitea',
}, },
}, },
@ -67,7 +67,7 @@ defaults = {
@metadata_reactor.provides( @metadata_reactor.provides(
'nginx/vhosts/gitea', 'nginx/vhosts/forgejo',
) )
def nginx(metadata): def nginx(metadata):
if not node.has_bundle('nginx'): if not node.has_bundle('nginx'):
@ -76,7 +76,7 @@ def nginx(metadata):
return { return {
'nginx': { 'nginx': {
'vhosts': { 'vhosts': {
'gitea': { 'forgejo': {
'domain': metadata.get('gitea/domain'), 'domain': metadata.get('gitea/domain'),
'locations': { 'locations': {
'/': { '/': {
@ -102,8 +102,7 @@ def icinga_check_for_new_release(metadata):
'icinga2_api': { 'icinga2_api': {
'gitea': { 'gitea': {
'services': { 'services': {
'GITEA UPDATE': { 'FORGEJO UPDATE': {
# this is only temporary. We will switch to forgejo once they have their first stable release.
'command_on_monitored_host': '/usr/local/share/icinga/plugins/check_forgejo_for_new_release codeberg.org forgejo/forgejo v{}'.format(metadata.get('gitea/version')), 'command_on_monitored_host': '/usr/local/share/icinga/plugins/check_forgejo_for_new_release codeberg.org forgejo/forgejo v{}'.format(metadata.get('gitea/version')),
'vars.notification.mail': True, 'vars.notification.mail': True,
'check_interval': '60m', 'check_interval': '60m',

2
nodes/rx300.py
View file

@ -327,7 +327,7 @@ nodes['rx300'] = {
}, },
'vhosts': { 'vhosts': {
'element-web': {'ssl': '_.franzi.business'}, 'element-web': {'ssl': '_.franzi.business'},
'gitea': {'ssl': '_.franzi.business'}, 'forgejo': {'ssl': '_.franzi.business'},
'jenkins-ci': {'ssl': '_.franzi.business'}, 'jenkins-ci': {'ssl': '_.franzi.business'},
'matrix-dimension': {'ssl': '_.franzi.business'}, 'matrix-dimension': {'ssl': '_.franzi.business'},
'matrix-synapse': {'ssl': '_.franzi.business'}, 'matrix-synapse': {'ssl': '_.franzi.business'},