Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

routinator: update to 0.12.1 and add runit service. #37848

Merged
merged 1 commit into from Jan 12, 2023
Merged

routinator: update to 0.12.1 and add runit service. #37848

merged 1 commit into from Jan 12, 2023

Conversation

klarasm
Copy link
Contributor

@klarasm klarasm commented Jul 4, 2022 •
edited

Update to 0.12.0 and add runit service.

  • Create a runit service

No longer relevant for now:

  • Build and include documentation
  • Add missing python packages required for documentation
    • python3-sphinx-tabs
    • python3-sphinx-copybutton

Testing the changes

Local build testing

  • I built this PR locally for my native architecture, (x86_64-glibc, x86_64-musl)
  • I built this PR locally for these architectures:
    • aarch64-musl
    • armv7l
    • armv6l-musl
    • x86_64-musl

@klarasm
Copy link
Contributor Author

klarasm commented Aug 21, 2022

Fix a typo in INSTALL.msg, add second commit for documentation.

@Duncaen
Copy link
Member

Duncaen commented Aug 21, 2022

Don't use INSTALL.msg for documentation add a README.voidlinux file like some other packages do if required.

@klarasm klarasm force-pushed the routinator-integration branch 3 times, most recently from 88816e4 to 2c8e8cd Compare August 21, 2022 22:44
@klarasm
Copy link
Contributor Author

klarasm commented Aug 21, 2022

Changed INSTALL.msg to README.voidlinux, fixed a build failure due to missing PyPI packages.

It seems that vsv routinator in post_install() fails. I'm a bit confused why this happens and haven't been able to replicate it on my build machine, even with ./xbps-src -K.

@Duncaen
Copy link
Member

Duncaen commented Aug 21, 2022

It seems that vsv routinator in post_install() fails. I'm a bit confused why this happens and haven't been able to replicate it on my build machine, even with ./xbps-src -K.

You did not commit the srcpkgs/routinator/files/routinator directory.

paper42
paper42 reviewed Aug 21, 2022
View reviewed changes
srcpkgs/routinator/template Outdated

case "$XBPS_TARGET_MACHINE" in
x86_64*|i686*|arm*|aarch64*) ;;
*) broken="ftbfs in ring" ;;
esac

post_build() {
pip install --user -r doc/manual/source/requirements.txt
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use hostmakedepends, pip is not deterministic and will pollute the masterdir

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What do I do if the packages are not in the void repos? I guess I could add them myself

@klarasm
Copy link
Contributor Author

klarasm commented Aug 21, 2022

It seems that vsv routinator in post_install() fails. I'm a bit confused why this happens and haven't been able to replicate it on my build machine, even with ./xbps-src -K.

You did not commit the srcpkgs/routinator/files/routinator directory.

Oh, that was stupid of me. Will fix.

@klarasm klarasm force-pushed the routinator-integration branch 2 times, most recently from 116efdd to d4cde95 Compare August 22, 2022 00:19
@klarasm
Copy link
Contributor Author

klarasm commented Aug 22, 2022

I've added the missing python packages, basically no testing done for them but the manual for routinator builds without pip now.

Is it ok for them to be in the same PR or should I create a separate one?

@klarasm klarasm mentioned this pull request Sep 28, 2022
Closed
@klarasm
Copy link
Contributor Author

klarasm commented Oct 22, 2022

I will convert this to a regular PR as I can't think of anything else to do for now. I could drop the manual if the python dependencies are not desired and the manual is available at https://routinator.docs.nlnetlabs.nl anyway.

@klarasm klarasm marked this pull request as ready for review October 22, 2022 12:04
@klarasm
Copy link
Contributor Author

klarasm commented Nov 9, 2022

It seems that ARIN has changed their RPA so it doesn't require explicit acceptance anymore. This will be in the upcoming 0.12 release and will also remove the need for initialization to run the service:
0.12.0-rc1 release
Pull request detailing the change.

This means that README.voidlinux can be removed after the release of 0.12.

@klarasm
Copy link
Contributor Author

klarasm commented Nov 13, 2022 •
edited

Upstream has released 0.12.0. Rebase on that so I can drop README.voidlinux. Seems to be the same build failure as in #39516.

I dropped the manual as I'm now getting build failures locally (other than the one in CI) with that and I'm not familiar enough with the python build process to correct that. I'll add the manual separately if I get to it.

@klarasm klarasm force-pushed the routinator-integration branch 2 times, most recently from a381a19 to 59a6b0d Compare November 15, 2022 18:45
@klarasm
Copy link
Contributor Author

klarasm commented Nov 15, 2022

Squashed commits and closed separate PR for update.

@klarasm klarasm changed the title routinator: integrate better into Void Linux routinator: update to 0.12.0 and add runit service. Nov 15, 2022
@klarasm klarasm changed the title routinator: update to 0.12.0 and add runit service. routinator: update to 0.12.1 and add runit service. Jan 11, 2023
@klarasm
Copy link
Contributor Author

klarasm commented Jan 11, 2023

Upstream has released 0.12.1

paper42
paper42 reviewed Jan 11, 2023
View reviewed changes
srcpkgs/routinator/files/routinator/run Outdated
@@ -0,0 +1,2 @@
#!/bin/sh
exec routinator --config /etc/routinator/routinator.conf server --user=_routinator --group=_routinator 2>&1
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this logs something, having a logging service would be nice. Look at the dockerd service in the moby package for an example.

Suggested change
exec routinator --config /etc/routinator/routinator.conf server --user=_routinator --group=_routinator 2>&1
[ -r conf ] && . ./conf
exec routinator --config ${CONF_FILE:-/etc/routinator/routinator.conf} server --user=_routinator --group=_routinator $OPTS 2>&1

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good idea! I have included the suggestion in the new commit. Seems to work ok from what I can see.

@paper42 paper42 self-assigned this Jan 11, 2023
@klarasm
routinator: update to 0.12.1
dff1046 
also:
- add runit service and system user/group
- change homepage (rpki.readthedocs.io no longer goes to routinator, it goes
to a general information page about RPKI)
@paper42
Copy link
Member

paper42 commented Jan 12, 2023

Thank you for the effort and sorry this took so long

@paper42 paper42 merged commit a55fd1f into void-linux:master Jan 12, 2023
@klarasm klarasm deleted the routinator-integration branch February 2, 2023 20:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@paper42 paper42 paper42 left review comments

Assignees

@paper42 paper42

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@klarasm @Duncaen @paper42