Merge pull request #268 from mekanix/feature/apply-proxy

Add command to apply PKG_PROXY setting

Makefile

@@ -64,7 +64,8 @@ MAKEFILES = ansible.mk \
 	    use.mk
 FRAMEWORKS_MAKEFILES = frameworks/freenit.project.mk \
 		       frameworks/freenit.service.mk
-SCRIPTS = bhyve-init.sh \
+SCRIPTS = apply-proxy.sh \
+	  bhyve-init.sh \
 	  cbsd-init.sh \
 	  chef-provision.sh \
 	  expect-run.sh \

cbsd-profile/system/master_poststop.d/deregister.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-CBSD_WORKDIR=`sysrc -n cbsd_workdir`
+CBSD_WORKDIR=`sysrc -s cbsdd -n cbsd_workdir`
 LOCK_DIR="${CBSD_WORKDIR}/tmp"
 LOCK_FILE="${LOCK_DIR}/cbsd.zone.lock"
 

cbsd-profile/system/master_prestart.d/register.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-CBSD_WORKDIR=`sysrc -n cbsd_workdir`
+CBSD_WORKDIR=`sysrc -s cbsdd -n cbsd_workdir`
 LOCK_DIR="${CBSD_WORKDIR}/tmp"
 LOCK_FILE="${LOCK_DIR}/cbsd.zone.lock"
 

mk/common.mk

@@ -8,7 +8,7 @@ RUNNING_GID != id -g
 UID ?= ${RUNNING_UID}
 GID ?= ${RUNNING_GID}
 DOMAIN != reggae get-config DOMAIN
-CBSD_WORKDIR != sysrc -n cbsd_workdir
+CBSD_WORKDIR != sysrc -s cbsdd -n cbsd_workdir
 EXTRA_PACKAGES =
 
 .for provisioner in ${PROVISIONERS}

scripts/apply-proxy.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+
+CBSD_WORKDIR=`sysrc -s cbsdd -n cbsd_workdir`
+PKG_PROXY=`reggae get-config PKG_PROXY`
+
+for jname in $(env NOCOLOR=1 cbsd jls header=0 display=jname); do
+  pkg_file="${CBSD_WORKDIR}/jails-data/${jname}-data/usr/local/etc/pkg.conf"
+  sed -i "" -r "/^pkg_env.*/d" "${pkg_file}"
+  if [ "${PKG_PROXY}" != "no" ]; then
+    echo "pkg_env : { http_proxy: \"http://${PKG_PROXY}/\" }" >>"${pkg_file}"
+  fi
+done

scripts/chef-provision.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-CBSD_WORKDIR=`sysrc -n cbsd_workdir`
+CBSD_WORKDIR=`sysrc -s cbsdd -n cbsd_workdir`
 SERVICE="${1}"
 TYPE="${2}"
 

scripts/import.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-CBSD_WORKDIR=`sysrc -n cbsd_workdir`
+CBSD_WORKDIR=`sysrc -s cbsdd -n cbsd_workdir`
 IMAGE_PATH="${1}"
 HYPERVISOR="${2:-jail}"
 DOMAIN=`reggae get-config DOMAIN`

scripts/network-init.sh

@@ -89,9 +89,9 @@ setup_pf() {
       -e "s;MASTER_IP;${MASTER_IP};g" \
       "${SCRIPT_DIR}/../templates/pf.conf" >/etc/pf.conf
   fi
-  sysrc pflog_enable="YES"
-  sysrc pf_enable="YES"
-  sysrc blacklistd_enable="YES"
+  service pflog enable
+  service pf enable
+  service blacklistd enable
   sysrc sshd_flags+="\-oUseBlacklist=yes"
 }
 

scripts/puppet-provision.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-CBSD_WORKDIR=`sysrc -n cbsd_workdir`
+CBSD_WORKDIR=`sysrc -s cbsdd -n cbsd_workdir`
 SERVICE="${1}"
 TYPE="${2}"
 

scripts/register.sh

@@ -9,7 +9,7 @@ if [ "${vnet}" != "1" ]; then
   fi
   . "${PROJECT_ROOT}/scripts/default.conf"
 
-  CBSD_WORKDIR=`sysrc -n cbsd_workdir`
+  CBSD_WORKDIR=`sysrc -s cbsdd -n cbsd_workdir`
   NAME=${jname}
   IP=${ipv4_first}
   ACTION="${1}"

scripts/salt-provision.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-CBSD_WORKDIR=`sysrc -n cbsd_workdir`
+CBSD_WORKDIR=`sysrc -s cbsdd -n cbsd_workdir`
 SERVICE="${1}"
 TYPE="${2}"
 PY_VERSION_MAJOR="3"

scripts/shell-provision.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-CBSD_WORKDIR=`sysrc -n cbsd_workdir`
+CBSD_WORKDIR=`sysrc -s cbsdd -n cbsd_workdir`
 SERVICE="${1}"
 TYPE="${2}"