Browse Source

move tals to /etc, where they can be upgraded by a "sysupgrade" if

such a circumstance ever occurs.
ok job
OPENBSD_6_6
deraadt 5 years ago
parent
commit
c65bc93cac
6 changed files with 44 additions and 2 deletions
  1. +5
    -1
      src/etc/Makefile
  2. +3
    -1
      src/etc/mtree/4.4BSD.dist
  3. +9
    -0
      src/etc/rpki/afrinic.tal
  4. +9
    -0
      src/etc/rpki/apnic.tal
  5. +9
    -0
      src/etc/rpki/lacnic.tal
  6. +9
    -0
      src/etc/rpki/ripe.tal

+ 5
- 1
src/etc/Makefile View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.469 2019/05/11 07:18:15 deraadt Exp $
# $OpenBSD: Makefile,v 1.470 2019/06/19 16:20:58 deraadt Exp $
.include <bsd.own.mk> .include <bsd.own.mk>
@ -153,6 +153,10 @@ distribution-etc-root-var: distrib-dirs
${DESTDIR}/etc/ppp; \ ${DESTDIR}/etc/ppp; \
${INSTALL} -c -o root -g wheel -m 600 pap-secrets \ ${INSTALL} -c -o root -g wheel -m 600 pap-secrets \
${DESTDIR}/etc/ppp ${DESTDIR}/etc/ppp
cd rpki; \
${INSTALL} -c -o root -g wheel -m 600 \
afrinic.tal apnic.tal lacnic.tal ripe.tal \
${DESTDIR}/etc/rpki
cd examples; \ cd examples; \
${INSTALL} -c -o root -g wheel -m 644 ${EXAMPLES} \ ${INSTALL} -c -o root -g wheel -m 644 ${EXAMPLES} \
${DESTDIR}/etc/examples; \ ${DESTDIR}/etc/examples; \


+ 3
- 1
src/etc/mtree/4.4BSD.dist View File

@ -1,4 +1,4 @@
# $OpenBSD: 4.4BSD.dist,v 1.310 2019/05/11 07:18:15 deraadt Exp $
# $OpenBSD: 4.4BSD.dist,v 1.311 2019/06/19 16:21:00 deraadt Exp $
/set type=dir uname=root gname=wheel mode=0755 /set type=dir uname=root gname=wheel mode=0755
@ -90,6 +90,8 @@ etc
.. ..
rc.d rc.d
.. ..
rpki
..
skel skel
.ssh uname=root mode=0700 .ssh uname=root mode=0700
.. ..


+ 9
- 0
src/etc/rpki/afrinic.tal View File

@ -0,0 +1,9 @@
rsync://rpki.afrinic.net/repository/AfriNIC.cer
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxsAqAhWIO+ON2Ef9oRDM
pKxv+AfmSLIdLWJtjrvUyDxJPBjgR+kVrOHUeTaujygFUp49tuN5H2C1rUuQavTH
vve6xNF5fU3OkTcqEzMOZy+ctkbde2SRMVdvbO22+TH9gNhKDc9l7Vu01qU4LeJH
k3X0f5uu5346YrGAOSv6AaYBXVgXxa0s9ZvgqFpim50pReQe/WI3QwFKNgpPzfQL
6Y7fDPYdYaVOXPXSKtx7P4s4KLA/ZWmRL/bobw/i2fFviAGhDrjqqqum+/9w1hEl
L/vqihVnV18saKTnLvkItA/Bf5i11Yhw2K7qv573YWxyuqCknO/iYLTR1DToBZcZ
UQIDAQAB

+ 9
- 0
src/etc/rpki/apnic.tal View File

@ -0,0 +1,9 @@
rsync://rpki.apnic.net/repository/apnic-rpki-root-iana-origin.cer
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx9RWSL61YAAYumEiU8z8
qH2ETVIL01ilxZlzIL9JYSORMN5Cmtf8V2JblIealSqgOTGjvSjEsiV73s67zYQI
7C/iSOb96uf3/s86NqbxDiFQGN8qG7RNcdgVuUlAidl8WxvLNI8VhqbAB5uSg/Mr
LeSOvXRja041VptAxIhcGzDMvlAJRwkrYK/Mo8P4E2rSQgwqCgae0ebY1CsJ3Cjf
i67C1nw7oXqJJovvXJ4apGmEv8az23OLC6Ki54Ul/E6xk227BFttqFV3YMtKx42H
cCcDVZZy01n7JjzvO8ccaXmHIgR7utnqhBRNNq5Xc5ZhbkrUsNtiJmrZzVlgU6Ou
0wIDAQAB

+ 9
- 0
src/etc/rpki/lacnic.tal View File

@ -0,0 +1,9 @@
rsync://repository.lacnic.net/rpki/lacnic/rta-lacnic-rpki.cer
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqZEzhYK0+PtDOPfub/KR
c3MeWx3neXx4/wbnJWGbNAtbYqXg3uU5J4HFzPgk/VIppgSKAhlO0H60DRP48by9
gr5/yDHu2KXhOmnMg46sYsUIpfgtBS9+VtrqWziJfb+pkGtuOWeTnj6zBmBNZKK+
5AlMCW1WPhrylIcB+XSZx8tk9GS/3SMQ+YfMVwwAyYjsex14Uzto4GjONALE5oh1
M3+glRQduD6vzSwOD+WahMbc9vCOTED+2McLHRKgNaQf0YJ9a1jG9oJIvDkKXEqd
fqDRktwyoD74cV57bW3tBAexB7GglITbInyQAsmdngtfg2LUMrcROHHP86QPZINj
DQIDAQAB

+ 9
- 0
src/etc/rpki/ripe.tal View File

@ -0,0 +1,9 @@
rsync://rpki.ripe.net/ta/ripe-ncc-ta.cer
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0URYSGqUz2myBsOzeW1j
Q6NsxNvlLMyhWknvnl8NiBCs/T/S2XuNKQNZ+wBZxIgPPV2pFBFeQAvoH/WK83Hw
A26V2siwm/MY2nKZ+Olw+wlpzlZ1p3Ipj2eNcKrmit8BwBC8xImzuCGaV0jkRB0G
Z0hoH6Ml03umLprRsn6v0xOP0+l6Qc1ZHMFVFb385IQ7FQQTcVIxrdeMsoyJq9eM
kE6DoclHhF/NlSllXubASQ9KUWqJ0+Ot3QCXr4LXECMfkpkVR2TZT+v5v658bHVs
6ZxRD1b6Uk1uQKAyHUbn/tXvP8lrjAibGzVsXDT2L0x4Edx+QdixPgOji3gBMyL2
VwIDAQAB

Loading…
Cancel
Save