From owner-svn-src-all@FreeBSD.ORG Mon Nov 24 08:09:51 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3F1ECB67; Mon, 24 Nov 2014 08:09:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2A358D43; Mon, 24 Nov 2014 08:09:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAO89pRn097107; Mon, 24 Nov 2014 08:09:51 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAO89pHF097106; Mon, 24 Nov 2014 08:09:51 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201411240809.sAO89pHF097106@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Mon, 24 Nov 2014 08:09:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r274952 - stable/10/usr.sbin/ctld X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Nov 2014 08:09:51 -0000 Author: trasz Date: Mon Nov 24 08:09:50 2014 New Revision: 274952 URL: https://svnweb.freebsd.org/changeset/base/274952 Log: MFC r273585: Improve ctld.conf example. Sponsored by: The FreeBSD Foundation Modified: stable/10/usr.sbin/ctld/ctl.conf.5 Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.sbin/ctld/ctl.conf.5 ============================================================================== --- stable/10/usr.sbin/ctld/ctl.conf.5 Mon Nov 24 08:06:29 2014 (r274951) +++ stable/10/usr.sbin/ctld/ctl.conf.5 Mon Nov 24 08:09:50 2014 (r274952) @@ -304,17 +304,24 @@ configuration file. .Bd -literal pidfile /var/run/ctld.pid -auth-group example2 { +auth-group ag0 { chap-mutual "user" "secret" "mutualuser" "mutualsecret" chap-mutual "user2" "secret2" "mutualuser" "mutualsecret" } -portal-group example2 { +auth-group ag1 { + auth-type none + initiator-name "iqn.2012-06.com.example:initiatorhost1" + initiator-name "iqn.2012-06.com.example:initiatorhost2" + initiator-portal 192.168.1.1/24 + initiator-portal [2001:db8::de:ef] +} + +portal-group pg0 { discovery-auth-group no-authentication - listen 127.0.0.1 - listen 0.0.0.0:3261 - listen [::]:3261 - listen [fe80::be:ef] + listen 0.0.0.0:3260 + listen [::]:3260 + listen [fe80::be:ef]:3261 } target iqn.2012-06.com.example:target0 { @@ -327,16 +334,16 @@ target iqn.2012-06.com.example:target0 { } } -target iqn.2012-06.com.example:target3 { +target iqn.2012-06.com.example:target1 { chap chapuser chapsecret lun 0 { - path /dev/zvol/tank/example_3 + path /dev/zvol/tank/example_1 } } target iqn.2012-06.com.example:target2 { - auth-group example2 - portal-group example2 + auth-group ag0 + portal-group pg0 lun 0 { path /dev/zvol/tank/example2_0 }