diff --git a/sysutils/reggae/Makefile b/sysutils/reggae/Makefile index 50c192c4b62b..faf8d4041459 100644 --- a/sysutils/reggae/Makefile +++ b/sysutils/reggae/Makefile @@ -1,20 +1,20 @@ PORTNAME= reggae -PORTVERSION= 0.1.16 +PORTVERSION= 0.1.17 CATEGORIES= sysutils MAINTAINER= meka@tilda.center COMMENT= Powerful DevOps solution heavily relaying on CBSD LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${LOCALBASE}/bin/cbsd:sysutils/cbsd \ sudo:security/sudo USE_GITHUB= yes GH_ACCOUNT= cbsd USE_RC_SUBR= reggae_pf NO_ARCH= yes .include diff --git a/sysutils/reggae/distinfo b/sysutils/reggae/distinfo index fa746081bcdd..d4183acdc908 100644 --- a/sysutils/reggae/distinfo +++ b/sysutils/reggae/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1600723946 -SHA256 (cbsd-reggae-0.1.16_GH0.tar.gz) = 63c5bd29a2592e87a7290601d0010d40af41faa706331cd348a6866a38d20d82 -SIZE (cbsd-reggae-0.1.16_GH0.tar.gz) = 46136 +TIMESTAMP = 1619431176 +SHA256 (cbsd-reggae-0.1.17_GH0.tar.gz) = 0682a8454350b35ca650010391a949177dd1d40954c6492ac963fbe6775a2a24 +SIZE (cbsd-reggae-0.1.17_GH0.tar.gz) = 46735 diff --git a/sysutils/reggae/files/reggae_pf.in b/sysutils/reggae/files/reggae_pf.in index 068ff762951c..74db0961a70b 100644 --- a/sysutils/reggae/files/reggae_pf.in +++ b/sysutils/reggae/files/reggae_pf.in @@ -1,38 +1,37 @@ #!/bin/sh # PROVIDE: reggae_pf -# REQUIRE: pf -# AFTER: NETWORKING local_unbound named nsd unbound +# REQUIRE: pf local_unbound # Add the following lines to /etc/rc.conf.local, /etc/rc.conf or # /etc/rc.conf.d/reggae_pf to enable this service: # # reggae_pf_enable (bool): Set to NO by default. # Set it to "YES" to enable virtual_oss. # reggae_pf_directory (string): Directory containing PF anchor files # Default is "/etc/pf.d" . /etc/rc.subr name=reggae_pf desc="Reggae helper to load PF anchors" rcvar=${name}_enable start_precmd="${name}_precmd" load_rc_config $name : ${reggae_pf_enable:="NO"} : ${reggae_pf_directory:="/etc/pf.d"} command="%%PREFIX%%/bin/reggae" command_args="pf ${reggae_pf_directory}" reggae_pf_precmd() { if [ ! -d "${reggae_pf_directory}" ]; then echo "${reggae_pf_directory} is not directory" >&2 exit 1 fi } run_rc_command $* diff --git a/sysutils/reggae/pkg-plist b/sysutils/reggae/pkg-plist index a21bb34ca4eb..6b536818c363 100644 --- a/sysutils/reggae/pkg-plist +++ b/sysutils/reggae/pkg-plist @@ -1,137 +1,139 @@ bin/reggae %%ETCDIR%%.conf.sample man/man1/reggae-ansible.1.gz man/man1/reggae-chef.1.gz man/man1/reggae-init.1.gz man/man1/reggae-project.1.gz man/man1/reggae-provision.1.gz man/man1/reggae-puppet.1.gz man/man1/reggae-register.1.gz man/man1/reggae-salt.1.gz man/man1/reggae-service.1.gz man/man1/reggae-shell.1.gz man/man1/reggae.1.gz %%DATADIR%%/cbsd-profile/jail-freebsd-reggae.conf %%DATADIR%%/cbsd-profile/skel/etc/crontab %%DATADIR%%/cbsd-profile/skel/etc/group %%DATADIR%%/cbsd-profile/skel/etc/mail/aliases %%DATADIR%%/cbsd-profile/skel/etc/mail/aliases.db %%DATADIR%%/cbsd-profile/skel/etc/make.conf %%DATADIR%%/cbsd-profile/skel/etc/master.passwd %%DATADIR%%/cbsd-profile/skel/etc/motd %%DATADIR%%/cbsd-profile/skel/etc/passwd %%DATADIR%%/cbsd-profile/skel/etc/pwd.db %%DATADIR%%/cbsd-profile/skel/etc/rc.conf %%DATADIR%%/cbsd-profile/skel/etc/spwd.db %%DATADIR%%/cbsd-profile/skel/root/.bashrc %%DATADIR%%/cbsd-profile/skel/root/.cshrc %%DATADIR%%/cbsd-profile/skel/usr/home/provision/.cshrc %%DATADIR%%/cbsd-profile/skel/usr/home/provision/.history %%DATADIR%%/cbsd-profile/skel/usr/home/provision/.login %%DATADIR%%/cbsd-profile/skel/usr/home/provision/.login_conf %%DATADIR%%/cbsd-profile/skel/usr/home/provision/.mail_aliases %%DATADIR%%/cbsd-profile/skel/usr/home/provision/.mailrc %%DATADIR%%/cbsd-profile/skel/usr/home/provision/.profile %%DATADIR%%/cbsd-profile/skel/usr/home/provision/.rhosts %%DATADIR%%/cbsd-profile/skel/usr/home/provision/.shrc %%DATADIR%%/cbsd-profile/skel/usr/local/etc/sudoers %%DATADIR%%/cbsd-profile/system/facts.d/reggae_ip %%DATADIR%%/cbsd-profile/system/master_poststart.d/placeholder %%DATADIR%%/cbsd-profile/system/master_poststop.d/deregister.sh %%DATADIR%%/cbsd-profile/system/master_poststop.d/placeholder %%DATADIR%%/cbsd-profile/system/master_prestart.d/placeholder %%DATADIR%%/cbsd-profile/system/master_prestart.d/register.sh %%DATADIR%%/cbsd-profile/system/master_prestop.d/placeholder %%DATADIR%%/cbsd-profile/system/remove.d/placeholder %%DATADIR%%/cbsd-profile/system/start.d/placeholder %%DATADIR%%/cbsd-profile/system/stop.d/placeholder %%DATADIR%%/id_rsa %%DATADIR%%/id_rsa.pub %%DATADIR%%/mk/ansible.mk %%DATADIR%%/mk/bhyve-service.mk %%DATADIR%%/mk/chef.mk %%DATADIR%%/mk/common.mk %%DATADIR%%/mk/frameworks/freenit.project.mk %%DATADIR%%/mk/frameworks/freenit.service.mk %%DATADIR%%/mk/freenit.project.mk %%DATADIR%%/mk/freenit.service.mk %%DATADIR%%/mk/jail-service.mk %%DATADIR%%/mk/project.mk %%DATADIR%%/mk/puppet.mk %%DATADIR%%/mk/salt.mk %%DATADIR%%/mk/service.mk %%DATADIR%%/mk/shell.mk +%%DATADIR%%/mk/use.mk %%DATADIR%%/scripts/bhyve-init.sh %%DATADIR%%/scripts/cbsd-init.sh %%DATADIR%%/scripts/chef-provision.sh %%DATADIR%%/scripts/default.conf %%DATADIR%%/scripts/expect-run.sh %%DATADIR%%/scripts/get-config.sh %%DATADIR%%/scripts/get-ip.sh %%DATADIR%%/scripts/import.sh %%DATADIR%%/scripts/init.sh %%DATADIR%%/scripts/master-init.sh %%DATADIR%%/scripts/network-init.sh %%DATADIR%%/scripts/pf.sh %%DATADIR%%/scripts/pkg-upgrade.sh %%DATADIR%%/scripts/project-init.sh %%DATADIR%%/scripts/puppet-provision.sh %%DATADIR%%/scripts/read-pass.sh %%DATADIR%%/scripts/register.sh %%DATADIR%%/scripts/salt-provision.sh %%DATADIR%%/scripts/scp.sh %%DATADIR%%/scripts/shell-provision.sh %%DATADIR%%/scripts/ssh-ping.sh %%DATADIR%%/scripts/ssh.sh %%DATADIR%%/scripts/update-profiles.sh %%DATADIR%%/scripts/version.sh %%DATADIR%%/skel/ansible/ansible/group_vars/.keep %%DATADIR%%/skel/ansible/ansible/inventory/.keep %%DATADIR%%/skel/ansible/ansible/roles/.keep %%DATADIR%%/skel/ansible/requirements.yml %%DATADIR%%/skel/ansible/templates/site.yml.tpl %%DATADIR%%/skel/chef/chef/cookbooks/core/recipes/default.rb %%DATADIR%%/skel/puppet/puppet/manifests/site.pp %%DATADIR%%/skel/salt/salt/states/core.sls %%DATADIR%%/skel/salt/salt/states/top.sls %%DATADIR%%/skel/shell/shell/provision.sh %%DATADIR%%/templates/Makefile.project %%DATADIR%%/templates/Makefile.service %%DATADIR%%/templates/ansible/group_vars/all.tpl %%DATADIR%%/templates/ansible/inventory.local.tpl %%DATADIR%%/templates/ansible/inventory.remote.tpl %%DATADIR%%/templates/cbsd-bhyve.conf.tpl %%DATADIR%%/templates/cbsd-vnet.conf.tpl %%DATADIR%%/templates/cbsd.conf.tpl %%DATADIR%%/templates/cloud-devops.sh %%DATADIR%%/templates/cloud-init/meta-data %%DATADIR%%/templates/cloud-init/user-data %%DATADIR%%/templates/cloud-initial.sh %%DATADIR%%/templates/devfs.rules %%DATADIR%%/templates/dhcpcd.conf %%DATADIR%%/templates/dhcpd-hook.sh %%DATADIR%%/templates/dhcpd.conf %%DATADIR%%/templates/export-ports.sh %%DATADIR%%/templates/freebsd-update.conf %%DATADIR%%/templates/gitignore +%%DATADIR%%/templates/gitignore.project %%DATADIR%%/templates/initenv.conf %%DATADIR%%/templates/install-packages.sh %%DATADIR%%/templates/ip-by-mac.sh %%DATADIR%%/templates/master.conf %%DATADIR%%/templates/master.fstab %%DATADIR%%/templates/mount-project.sh %%DATADIR%%/templates/named.conf %%DATADIR%%/templates/network %%DATADIR%%/templates/pf.conf %%DATADIR%%/templates/pkg.conf %%DATADIR%%/templates/reggae-register.sh %%DATADIR%%/templates/resolvconf.conf %%DATADIR%%/templates/setup-vm.sh %%DATADIR%%/templates/sudoers %%DATADIR%%/templates/unbound.conf %%DATADIR%%/templates/unbound_cbsd.conf %%DATADIR%%/templates/unbound_cbsd.zone %%DATADIR%%/templates/unbound_cbsd_reverse.conf %%DATADIR%%/templates/unbound_cbsd_reverse.zone %%DATADIR%%/templates/unbound_control.conf %%DATADIR%%/templates/xorg.sh