Date: Tue, 21 Apr 2015 17:01:41 +0000 From: bugzilla-noreply@freebsd.org To: freebsd-ports-bugs@FreeBSD.org Subject: [Bug 199586] sysutils/qjail: Configurable directory Message-ID: <bug-199586-13@https.bugs.freebsd.org/bugzilla/>
next in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=199586 Bug ID: 199586 Summary: sysutils/qjail: Configurable directory Product: Ports & Packages Version: Latest Hardware: Any OS: Any Status: New Severity: Affects Some People Priority: --- Component: Individual Port(s) Assignee: freebsd-ports-bugs@FreeBSD.org Reporter: vfx9as@gmail.com CC: qjail1@a1poweruser.com Flags: maintainer-feedback?(qjail1@a1poweruser.com) CC: qjail1@a1poweruser.com Configurable directory config file:/usr/local/etc/qjail.conf diff -rcNw org/pkg-plist new/pkg-plist *** org/pkg-plist Wed Apr 22 01:39:40 2015 --- new/pkg-plist Wed Apr 22 01:45:10 2015 *************** *** 1,6 **** --- 1,7 ---- bin/qjail bin/qjail.vnet.be bin/qjail.vnet.ng + @sample etc/qjail.conf.sample @sample etc/qjail.portsnap.conf.sample etc/rc.d/qjail.bootime man/man8/qjail.8.gz diff -rcNw org/qjail new/qjail *** org/qjail Tue Apr 21 23:38:39 2015 --- new/qjail Wed Apr 22 01:56:03 2015 *************** *** 46,51 **** --- 46,53 ---- ftp_host="ftp2.freebsd.org" log="/var/log/qjail.log" + . /usr/local/etc/qjail.conf + # Syntax messages for command options. syntax_commands="qjail Version 3.8\n\ Syntax: qjail [install|create|list|start|stop|restart|console|archive|\n\ diff -rcNw org/qjail.conf.sample new/qjail.conf.sample *** org/qjail.conf.sample Thu Jan 1 09:00:00 1970 --- new/qjail.conf.sample Wed Apr 22 01:56:23 2015 *************** *** 0 **** --- 1,17 ---- + examples="/usr/local/share/examples/qjail" + jaildefs_vnet="/usr/local/etc/qjail.vnet" + jaildefs_config="/usr/local/etc/qjail.config" + jaildefs="/usr/local/etc/qjail.local" + jaildefs_global="/usr/local/etc/qjail.global" + jailpkg="/usr/local/etc/qjail.packages" + fstab="/usr/local/etc/qjail.fstab" + + jaildir="/usr/jails" + template="${jaildir}/template" + sharedfs="${jaildir}/sharedfs" + download="${jaildir}/download" + flavors_dir="${jaildir}/flavors" + archive_dir="${jaildir}/archive" + default_flavor="default" + ftp_host="ftp2.freebsd.org" + log="/var/log/qjail.log" diff -rcNw org/qjail.vnet.be new/qjail.vnet.be *** org/qjail.vnet.be Tue Apr 21 23:38:39 2015 --- new/qjail.vnet.be Wed Apr 22 01:26:09 2015 *************** *** 5,10 **** --- 5,11 ---- nicname=$3 firewall=$4 + . /usr/local/etc/qjail.conf start () { *************** *** 88,94 **** # jexec ${jailname} service netif start > /dev/null 2> /dev/null jexec ${jailname} service routing start > /dev/null 2> /dev/null ! ipfw_epair="/usr/jails/${jailname}/etc/epair" jexec ${jailname} ifconfig | grep -m 1 epair | cut -f 1 -d : > ${ipfw_epair} jexec ${jailname} service ipfw start > /dev/null 2> /dev/null exit 0 --- 89,95 ---- # jexec ${jailname} service netif start > /dev/null 2> /dev/null jexec ${jailname} service routing start > /dev/null 2> /dev/null ! ipfw_epair="${jaildir}/${jailname}/etc/epair" jexec ${jailname} ifconfig | grep -m 1 epair | cut -f 1 -d : > ${ipfw_epair} jexec ${jailname} service ipfw start > /dev/null 2> /dev/null exit 0 *************** *** 112,118 **** # jexec ${jailname} service netif start > /dev/null 2> /dev/null jexec ${jailname} service routing start > /dev/null 2> /dev/null ! pf_epair="/usr/jails/${jailname}/etc/epair" jexec ${jailname} ifconfig | grep -m 1 epair | cut -f 1 -d : > ${pf_epair} jexec ${jailname} service pf start > /dev/null 2> /dev/null # jexec ${jailname} pfctl -F all; pfctl -f /etc/pf.rules --- 113,119 ---- # jexec ${jailname} service netif start > /dev/null 2> /dev/null jexec ${jailname} service routing start > /dev/null 2> /dev/null ! pf_epair="${jaildir}/${jailname}/etc/epair" jexec ${jailname} ifconfig | grep -m 1 epair | cut -f 1 -d : > ${pf_epair} jexec ${jailname} service pf start > /dev/null 2> /dev/null # jexec ${jailname} pfctl -F all; pfctl -f /etc/pf.rules *************** *** 129,135 **** # jexec ${jailname} service netif start > /dev/null 2> /dev/null jexec ${jailname} service routing start > /dev/null 2> /dev/null ! ipf_epair="/usr/jails/${jailname}/etc/epair" jexec ${jailname} ifconfig | grep -m 1 epair | cut -f 1 -d : > ${ipf_epair} jexec ${jailname} service ipfilter start > /dev/null 2> /dev/null fi --- 130,136 ---- # jexec ${jailname} service netif start > /dev/null 2> /dev/null jexec ${jailname} service routing start > /dev/null 2> /dev/null ! ipf_epair="${jaildir}/${jailname}/etc/epair" jexec ${jailname} ifconfig | grep -m 1 epair | cut -f 1 -d : > ${ipf_epair} jexec ${jailname} service ipfilter start > /dev/null 2> /dev/null fi diff -rcNw org/qjail.vnet.ng new/qjail.vnet.ng *** org/qjail.vnet.ng Tue Apr 21 23:38:39 2015 --- new/qjail.vnet.ng Wed Apr 22 01:56:53 2015 *************** *** 8,13 **** --- 8,15 ---- nicname=$3 firewall=$4 + . /usr/local/etc/qjail.conf + jid=`jls -j ${jailname} jid` # Load netgraph kernel modules if not done already. *************** *** 191,197 **** # Start services inside of jail needed by ipfw firewall. # Note: using service command because it's not nojail keyword aware. # ! ipfw_epair="/usr/jails/${jailname}/etc/epair" echo "${eiface}" > ${ipfw_epair} jexec ${jailname} service netif start > /dev/null 2> /dev/null jexec ${jailname} service routing start > /dev/null 2> /dev/null --- 193,199 ---- # Start services inside of jail needed by ipfw firewall. # Note: using service command because it's not nojail keyword aware. # ! ipfw_epair="${jaildir}/${jailname}/etc/epair" echo "${eiface}" > ${ipfw_epair} jexec ${jailname} service netif start > /dev/null 2> /dev/null jexec ${jailname} service routing start > /dev/null 2> /dev/null -- You are receiving this mail because: You are the assignee for the bug.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-199586-13>