Modified: qpid/site/input/releases/qpid-dispatch-master/man/qdrouterd.conf.html.in URL: http://svn.apache.org/viewvc/qpid/site/input/releases/qpid-dispatch-master/man/qdrouterd.conf.html.in?rev=1737854&r1=1737853&r2=1737854&view=diff ============================================================================== --- qpid/site/input/releases/qpid-dispatch-master/man/qdrouterd.conf.html.in (original) +++ qpid/site/input/releases/qpid-dispatch-master/man/qdrouterd.conf.html.in Tue Apr 5 17:01:10 2016 @@ -1,4 +1,5 @@ + <div class="section" id="qdrouterd-conf-manual-page"> <h1>qdrouterd.conf manual page<a class="headerlink" href="#qdrouterd-conf-manual-page" title="Permalink to this headline">.</a></h1> @@ -9,12 +10,11 @@ <div class="section" id="description"> <h2>Description<a class="headerlink" href="#description" title="Permalink to this headline">.</a></h2> <p>The configuration file is made up of sections with this syntax:</p> -<div class="highlight-python"><div class="highlight"><pre>SECTION-NAME { +<div class="highlight-python"><pre>SECTION-NAME { ATTRIBUTE-NAME: ATTRIBUTE-VALUE ATTRIBUTE-NAME: ATTRIBUTE-VALUE ... -} -</pre></div> +}</pre> </div> <p>There are two types of sections:</p> <p><em>Configuration sections</em> correspond to configuration entities. They can be queried and @@ -25,7 +25,7 @@ one or more entity sections.</p> that can be included in multiple “listener” entities. Here’s an example, note how the ‘ssl-profile’ attribute of ‘listener’ sections references the ‘name’ attribute of ‘ssl-profile’ sections.</p> -<div class="highlight-python"><div class="highlight"><pre>ssl-profile { +<div class="highlight-python"><pre>ssl-profile { name: ssl-profile-one cert-db: ca-certificate-1.pem cert-file: server-certificate-1.pem @@ -37,8 +37,7 @@ listener { addr: 0.0.0.0 port: 20102 sasl-mechanisms: ANONYMOUS -} -</pre></div> +}</pre> </div> </div> <div class="section" id="annotation-sections"> @@ -52,6 +51,8 @@ listener { <dd>IP address: ipv4 or ipv6 literal or a host name.</dd> <dt><em>port</em> (string, default=’amqp’)</dt> <dd>Port number or symbolic service name.</dd> +<dt><em>protocolFamily</em> (One of [‘IPv4’, ‘IPv6’])</dt> +<dd>[‘IPv4’, ‘IPv6’] IPv4: Internet Protocol version 4; IPv6: Internet Protocol version 6. If not specified, the protocol family will be automatically determined from the address.</dd> </dl> </div> <div class="section" id="connectionrole"> @@ -59,7 +60,7 @@ listener { <p>Attribute for the role of a connection.</p> <p>Used by: <strong>listener</strong>, <strong>connector</strong>.</p> <dl class="docutils"> -<dt><em>role</em> (One of [‘normal’, ‘inter-router’, ‘on-demand’], default=’normal’)</dt> +<dt><em>role</em> (One of [‘normal’, ‘inter-router’, ‘route-container’, ‘on-demand’], default=’normal’)</dt> <dd>The role of an established connection. In the normal role, the connection is assumed to be used for AMQP clients that are doing normal message delivery over the connection. In the inter-router role, the connection is assumed to be to another router in the network. Inter-router discovery and routing protocols can only be used over inter-router connections.</dd> </dl> </div> @@ -78,6 +79,10 @@ listener { <dd>If the above private key is password protected, this is the path to a file containing the password that unlocks the certificate key.</dd> <dt><em>password</em> (string)</dt> <dd>An alternative to storing the password in a file referenced by passwordFile is to supply the password right here in the configuration file. This option can be used by supplying the password in the ‘password’ option. Don’t use both password and passwordFile in the same profile.</dd> +<dt><em>uidFormat</em> (string)</dt> +<dd>A list of x509 client certificate fields that will be used to build a string that will uniquely identify the client certificate owner. For e.g. a value of ‘cou’ indicates that the uid will consist of c - common name concatenated with o - organization-company name concatenated with u - organization unit; or a value of ‘oF’ indicates that the uid will consist of o (organization name) concatenated with F (the sha256 fingerprint of the entire certificate) . Allowed values can be any combination of comma separated ‘c’( ISO3166 two character country code), ‘s’(state or province), ‘l’(Locality; generally - city), ‘o’(Organization - Company Name), ‘u’(Organization Unit - typically certificate type or brand), ‘n’(CommonName - typically a user name for client certificates) and ‘1’(sha1 certificate fingerprint, as displayed in the fingerprints section when looking at a certificate wi th say a web browser is the hash of the entire certificate) and 2 (sha256 certificate fingerprint) and 5 (sha512 certificate fingerprint).</dd> +<dt><em>displayNameFile</em> (string)</dt> +<dd>The path to the file containing the unique id to dispay name mapping</dd> </dl> </div> </div> @@ -105,8 +110,8 @@ listener { <dl class="docutils"> <dt><em>routerId</em> (string)</dt> <dd>Router’s unique identity.</dd> -<dt><em>mode</em> (One of [‘standalone’, ‘interior’, ‘edge’, ‘endpoint’], default=’standalone’)</dt> -<dd>In standalone mode, the router operates as a single component. It does not participate in the routing protocol and therefore will not cooperate with other routers. In interior mode, the router operates in cooperation with other interior routers in an interconnected network. In edge mode, the router operates with an up link into an interior router network. Edge routers are typically used as connection concentrators or as security firewalls for access into the interior network.</dd> +<dt><em>mode</em> (One of [‘standalone’, ‘interior’], default=’standalone’)</dt> +<dd>In standalone mode, the router operates as a single component. It does not participate in the routing protocol and therefore will not cooperate with other routers. In interior mode, the router operates in cooperation with other interior routers in an interconnected network.</dd> <dt><em>helloInterval</em> (integer, default=1)</dt> <dd>Interval in seconds between HELLO messages sent to neighbor routers.</dd> <dt><em>helloMaxAge</em> (integer, default=3)</dt> @@ -118,7 +123,7 @@ listener { <dt><em>remoteLsMaxAge</em> (integer, default=60)</dt> <dd>Time in seconds after which link state is declared stale if no RA is received.</dd> <dt><em>mobileAddrMaxAge</em> (integer, default=60)</dt> -<dd>Deprecated - This value is no longer used in the router.</dd> +<dd>(DEPRECATED) This value is no longer used in the router.</dd> </dl> </div> <div class="section" id="listener"> @@ -130,7 +135,9 @@ listener { <dd>IP address: ipv4 or ipv6 literal or a host name.</dd> <dt><em>port</em> (string, default=’amqp’)</dt> <dd>Port number or symbolic service name.</dd> -<dt><em>role</em> (One of [‘normal’, ‘inter-router’, ‘on-demand’], default=’normal’)</dt> +<dt><em>protocolFamily</em> (One of [‘IPv4’, ‘IPv6’])</dt> +<dd>[‘IPv4’, ‘IPv6’] IPv4: Internet Protocol version 4; IPv6: Internet Protocol version 6. If not specified, the protocol family will be automatically determined from the address.</dd> +<dt><em>role</em> (One of [‘normal’, ‘inter-router’, ‘route-container’, ‘on-demand’], default=’normal’)</dt> <dd>The role of an established connection. In the normal role, the connection is assumed to be used for AMQP clients that are doing normal message delivery over the connection. In the inter-router role, the connection is assumed to be to another router in the network. Inter-router discovery and routing protocols can only be used over inter-router connections.</dd> <dt><em>certDb</em> (path)</dt> <dd>The path to the database that contains the public certificates of trusted certificate authorities (CA).</dd> @@ -142,6 +149,10 @@ listener { <dd>If the above private key is password protected, this is the path to a file containing the password that unlocks the certificate key.</dd> <dt><em>password</em> (string)</dt> <dd>An alternative to storing the password in a file referenced by passwordFile is to supply the password right here in the configuration file. This option can be used by supplying the password in the ‘password’ option. Don’t use both password and passwordFile in the same profile.</dd> +<dt><em>uidFormat</em> (string)</dt> +<dd>A list of x509 client certificate fields that will be used to build a string that will uniquely identify the client certificate owner. For e.g. a value of ‘cou’ indicates that the uid will consist of c - common name concatenated with o - organization-company name concatenated with u - organization unit; or a value of ‘oF’ indicates that the uid will consist of o (organization name) concatenated with F (the sha256 fingerprint of the entire certificate) . Allowed values can be any combination of comma separated ‘c’( ISO3166 two character country code), ‘s’(state or province), ‘l’(Locality; generally - city), ‘o’(Organization - Company Name), ‘u’(Organization Unit - typically certificate type or brand), ‘n’(CommonName - typically a user name for client certificates) and ‘1’(sha1 certificate fingerprint, as displayed in the fingerprints section when looking at a certificate wi th say a web browser is the hash of the entire certificate) and 2 (sha256 certificate fingerprint) and 5 (sha512 certificate fingerprint).</dd> +<dt><em>displayNameFile</em> (string)</dt> +<dd>The path to the file containing the unique id to dispay name mapping</dd> <dt><em>saslMechanisms</em> (string)</dt> <dd>Comma separated list of accepted SASL authentication mechanisms.</dd> <dt><em>authenticatePeer</em> (boolean)</dt> @@ -157,25 +168,29 @@ listener { <dt><em>idleTimeoutSeconds</em> (integer, default=16)</dt> <dd>The idle timeout, in seconds, for connections through this listener. If no frames are received on the connection for this time interval, the connection shall be closed.</dd> <dt><em>requirePeerAuth</em> (boolean)</dt> -<dd>Deprecated - This attribute is now controlled by the authenticatePeer attribute.</dd> +<dd>(DEPRECATED) This attribute is now controlled by the authenticatePeer attribute.</dd> <dt><em>allowUnsecured</em> (boolean)</dt> -<dd>Deprecated - This attribute is now controlled by the requireEncryption attribute.</dd> +<dd>(DEPRECATED) This attribute is now controlled by the requireEncryption attribute.</dd> <dt><em>allowNoSasl</em> (boolean)</dt> -<dd>Deprecated - This attribute is now controlled by the authenticatePeer attribute.</dd> +<dd>(DEPRECATED) This attribute is now controlled by the authenticatePeer attribute.</dd> <dt><em>stripAnnotations</em> (One of [‘in’, ‘out’, ‘both’, ‘no’], default=’both’)</dt> <dd>[‘in’, ‘out’, ‘both’, ‘no’] in: Strip the dispatch router specific annotations only on ingress; out: Strip the dispatch router specific annotations only on egress; both: Strip the dispatch router specific annotations on both ingress and egress; no - do not strip dispatch router specific annotations</dd> +<dt><em>linkCapacity</em> (integer)</dt> +<dd>The capacity of links within this connection, in terms of message deliveries. The capacity is the number of messages that can be in-flight concurrently for each link.</dd> </dl> </div> <div class="section" id="connector"> <h3>connector<a class="headerlink" href="#connector" title="Permalink to this headline">.</a></h3> -<p>Establishes an outgoing connections from the router.</p> +<p>Establishes an outgoing connection from the router.</p> <p>Annotations: <strong>addrPort</strong>, <strong>connectionRole</strong>, <strong>sslProfile</strong>.</p> <dl class="docutils"> <dt><em>addr</em> (string, default=‘127.0.0.1’)</dt> <dd>IP address: ipv4 or ipv6 literal or a host name.</dd> <dt><em>port</em> (string, default=’amqp’)</dt> <dd>Port number or symbolic service name.</dd> -<dt><em>role</em> (One of [‘normal’, ‘inter-router’, ‘on-demand’], default=’normal’)</dt> +<dt><em>protocolFamily</em> (One of [‘IPv4’, ‘IPv6’])</dt> +<dd>[‘IPv4’, ‘IPv6’] IPv4: Internet Protocol version 4; IPv6: Internet Protocol version 6. If not specified, the protocol family will be automatically determined from the address.</dd> +<dt><em>role</em> (One of [‘normal’, ‘inter-router’, ‘route-container’, ‘on-demand’], default=’normal’)</dt> <dd>The role of an established connection. In the normal role, the connection is assumed to be used for AMQP clients that are doing normal message delivery over the connection. In the inter-router role, the connection is assumed to be to another router in the network. Inter-router discovery and routing protocols can only be used over inter-router connections.</dd> <dt><em>certDb</em> (path)</dt> <dd>The path to the database that contains the public certificates of trusted certificate authorities (CA).</dd> @@ -187,6 +202,10 @@ listener { <dd>If the above private key is password protected, this is the path to a file containing the password that unlocks the certificate key.</dd> <dt><em>password</em> (string)</dt> <dd>An alternative to storing the password in a file referenced by passwordFile is to supply the password right here in the configuration file. This option can be used by supplying the password in the ‘password’ option. Don’t use both password and passwordFile in the same profile.</dd> +<dt><em>uidFormat</em> (string)</dt> +<dd>A list of x509 client certificate fields that will be used to build a string that will uniquely identify the client certificate owner. For e.g. a value of ‘cou’ indicates that the uid will consist of c - common name concatenated with o - organization-company name concatenated with u - organization unit; or a value of ‘oF’ indicates that the uid will consist of o (organization name) concatenated with F (the sha256 fingerprint of the entire certificate) . Allowed values can be any combination of comma separated ‘c’( ISO3166 two character country code), ‘s’(state or province), ‘l’(Locality; generally - city), ‘o’(Organization - Company Name), ‘u’(Organization Unit - typically certificate type or brand), ‘n’(CommonName - typically a user name for client certificates) and ‘1’(sha1 certificate fingerprint, as displayed in the fingerprints section when looking at a certificate wi th say a web browser is the hash of the entire certificate) and 2 (sha256 certificate fingerprint) and 5 (sha512 certificate fingerprint).</dd> +<dt><em>displayNameFile</em> (string)</dt> +<dd>The path to the file containing the unique id to dispay name mapping</dd> <dt><em>saslMechanisms</em> (string)</dt> <dd>Comma separated list of accepted SASL authentication mechanisms.</dd> <dt><em>allowRedirect</em> (boolean, default=True)</dt> @@ -197,6 +216,12 @@ listener { <dd>The idle timeout, in seconds, for connections through this connector. If no frames are received on the connection for this time interval, the connection shall be closed.</dd> <dt><em>stripAnnotations</em> (One of [‘in’, ‘out’, ‘both’, ‘no’], default=’both’)</dt> <dd>[‘in’, ‘out’, ‘both’, ‘no’] in: Strip the dispatch router specific annotations only on ingress; out: Strip the dispatch router specific annotations only on egress; both: Strip the dispatch router specific annotations on both ingress and egress; no - do not strip dispatch router specific annotations</dd> +<dt><em>linkCapacity</em> (integer)</dt> +<dd>The capacity of links within this connection, in terms of message deliveries. The capacity is the number of messages that can be in-flight concurrently for each link.</dd> +<dt><em>saslUsername</em> (string)</dt> +<dd>The user name that the connector is using to connect to a peer.</dd> +<dt><em>saslPassword</em> (string)</dt> +<dd>The password that the connector is using to connect to a peer.</dd> </dl> </div> <div class="section" id="log"> @@ -215,7 +240,7 @@ listener { </div> <div class="section" id="fixedaddress"> <h3>fixedAddress<a class="headerlink" href="#fixedaddress" title="Permalink to this headline">.</a></h3> -<p>Establishes semantics for addresses starting with a prefix.</p> +<p>(DEPRECATED) Establishes treatment for addresses starting with a prefix.</p> <dl class="docutils"> <dt><em>prefix</em> (string, required)</dt> <dd>The address prefix (always starting with ‘/’).</dd> @@ -229,7 +254,7 @@ listener { </div> <div class="section" id="waypoint"> <h3>waypoint<a class="headerlink" href="#waypoint" title="Permalink to this headline">.</a></h3> -<p>A remote node that messages for an address pass through.</p> +<p>(DEPRECATED) A remote node that messages for an address pass through.</p> <dl class="docutils"> <dt><em>address</em> (string, required)</dt> <dd>The AMQP address of the waypoint.</dd> @@ -243,20 +268,102 @@ listener { </div> <div class="section" id="linkroutepattern"> <h3>linkRoutePattern<a class="headerlink" href="#linkroutepattern" title="Permalink to this headline">.</a></h3> -<p>An address pattern to match against link sources and targets to cause the router to link-route the attach across the network to a remote node.</p> +<p>(DEPRECATED) An address pattern to match against link sources and targets to cause the router to link-route the attach across the network to a remote node.</p> <dl class="docutils"> <dt><em>prefix</em> (string, required)</dt> -<dd>An address prefix to match against target and source addresses. From Dispatch 0.6 onwards, this pattern must be of the form ‘<text>/<text1>/...’ or just ‘<text>’ and matches any address that contains that prefix. For example, if the prefix is set to org/apache any address that has the prefix ‘org/apache’ like org/apache/dev will match. Note that a prefix must not start or end with a slash (/) and can contain zero or more slashes (/). Any characters between the slashes are simply treated as part of the address</dd> +<dd>An address prefix to match against target and source addresses. This pattern must be of the form ‘<text>.<text1>.<textN>’ or ‘<text>’ or ‘<text>.’ and matches any address that contains that prefix. For example, if the prefix is set to org.apache (or org.apache.), any address that has the prefix ‘org.apache’ (like org.apache.dev) will match. Note that a prefix must not start with a (.), can end in a (.) and can contain zero or more dots (.). Any characters between the dots are simply treated as part of the address</dd> <dt><em>dir</em> (One of [‘in’, ‘out’, ‘both’], default=’both’)</dt> <dd>Link direction for match: ‘in’ matches only links inbound to the client; ‘out’ matches only links outbound from the client; ‘both’ matches any link.</dd> <dt><em>connector</em> (string)</dt> <dd>The name of the on-demand connector used to reach the target node’s container. If this value is not provided, it means that the target container is expected to be connected to a different router in the network. This prevents links to a link-routable address from being misinterpreted as message-routing links when there is no route to a valid destination available.</dd> </dl> </div> +<div class="section" id="router-config-address"> +<h3>router.config.address<a class="headerlink" href="#router-config-address" title="Permalink to this headline">.</a></h3> +<p>Entity type for address configuration. This is used to configure the treatment of message-routed deliveries within a particular address-space. The configuration controls distribution and address phasing.</p> +<dl class="docutils"> +<dt><em>prefix</em> (string, required)</dt> +<dd>The address prefix for the configured settings</dd> +<dt><em>distribution</em> (One of [‘multicast’, ‘closest’, ‘balanced’], default=’balanced’)</dt> +<dd>Treatment of traffic associated with the address</dd> +<dt><em>waypoint</em> (boolean)</dt> +<dd>Designates this address space as being used for waypoints. This will cause the proper address-phasing to be used.</dd> +<dt><em>ingressPhase</em> (integer)</dt> +<dd>Advanced - Override the ingress phase for this address</dd> +<dt><em>egressPhase</em> (integer)</dt> +<dd>Advanced - Override the egress phase for this address</dd> +</dl> +</div> +<div class="section" id="router-config-linkroute"> +<h3>router.config.linkRoute<a class="headerlink" href="#router-config-linkroute" title="Permalink to this headline">.</a></h3> +<p>Entity type for link-route configuration. This is used to identify remote containers that shall be destinations for routed link-attaches. The link-routing configuration applies to an addressing space defined by a prefix.</p> +<dl class="docutils"> +<dt><em>prefix</em> (string, required)</dt> +<dd>The address prefix for the configured settings</dd> +<dt><em>containerId</em> (string)</dt> +<dd>ContainerID for the target container</dd> +<dt><em>connection</em> (string)</dt> +<dd>The name from a connector or listener</dd> +<dt><em>distribution</em> (One of [‘linkBalanced’], default=’linkBalanced’)</dt> +<dd>Treatment of traffic associated with the address</dd> +<dt><em>dir</em> (One of [‘in’, ‘out’], required)</dt> +<dd>The permitted direction of links: ‘in’ means client senders; ‘out’ means client receivers</dd> +</dl> +</div> +<div class="section" id="router-config-autolink"> +<h3>router.config.autoLink<a class="headerlink" href="#router-config-autolink" title="Permalink to this headline">.</a></h3> +<p>Entity type for configuring auto-links. Auto-links are links whose lifecycle is managed by the router. These are typically used to attach to waypoints on remote containers (brokers, etc.).</p> +<dl class="docutils"> +<dt><em>addr</em> (string, required)</dt> +<dd>The address of the provisioned object</dd> +<dt><em>dir</em> (One of [‘in’, ‘out’], required)</dt> +<dd>The direction of the link to be created. In means into the router, out means out of the router.</dd> +<dt><em>phase</em> (integer)</dt> +<dd>The address phase for this link. Defaults to ‘0’ for ‘out’ links and ‘1’ for ‘in’ links.</dd> +<dt><em>containerId</em> (string)</dt> +<dd>ContainerID for the target container</dd> +<dt><em>connection</em> (string)</dt> +<dd>The name from a connector or listener</dd> +</dl> +</div> <div class="section" id="console"> <h3>console<a class="headerlink" href="#console" title="Permalink to this headline">.</a></h3> <p>Start a websocket/tcp proxy and http file server to serve the web console</p> </div> +<div class="section" id="policy"> +<h3>policy<a class="headerlink" href="#policy" title="Permalink to this headline">.</a></h3> +<p>Defines global connection limit</p> +<dl class="docutils"> +<dt><em>maximumConnections</em> (integer)</dt> +<dd>Global maximum number of concurrent client connections allowed. Zero implies no limit. This limit is always enforced even if no other policy settings have been defined.</dd> +<dt><em>enableAccessRules</em> (boolean)</dt> +<dd>Enable user rule set processing and connection denial.</dd> +<dt><em>policyFolder</em> (path)</dt> +<dd>The path to a folder that holds policyRuleset definition .json files. For a small system the rulesets may all be defined in this file. At a larger scale it is better to have the policy files in their own folder and to have none of the rulesets defined here. All rulesets in all .json files in this folder are processed.</dd> +</dl> +</div> +<div class="section" id="policyruleset"> +<h3>policyRuleset<a class="headerlink" href="#policyruleset" title="Permalink to this headline">.</a></h3> +<p>Per application definition of the locations from which users may connect and the groups to which users belong.</p> +<dl class="docutils"> +<dt><em>maxConnections</em> (integer)</dt> +<dd>Maximum number of concurrent client connections allowed. Zero implies no limit.</dd> +<dt><em>maxConnPerUser</em> (integer)</dt> +<dd>Maximum number of concurrent client connections allowed for any single user. Zero implies no limit.</dd> +<dt><em>maxConnPerHost</em> (integer)</dt> +<dd>Maximum number of concurrent client connections allowed for any remote host. Zero implies no limit.</dd> +<dt><em>userGroups</em> (map)</dt> +<dd>A map where each key is a user group name and the corresponding value is a CSV string naming the users in that group. Users who are assigned to one or more groups are deemed ‘restricted’. Restricted users are subject to connection ingress policy and are assigned policy settings based on the assigned user groups. Unrestricted users may be allowed or denied. If unrestricted users are allowed to connect then they are assigned to user group default.</dd> +<dt><em>ingressHostGroups</em> (map)</dt> +<dd>A map where each key is an ingress host group name and the corresponding value is a CSV string naming the IP addresses or address ranges in that group. IP addresses may be FQDN strings or numeric IPv4 or IPv6 host addresses. A host range is two host addresses of the same address family separated with a hyphen. The wildcard host address ‘*’ represents any host address.</dd> +<dt><em>ingressPolicies</em> (map)</dt> +<dd>A map where each key is a user group name and the corresponding value is a CSV string naming the ingress host group names that restrict the ingress host for the user group. Users who are members of the user group are allowed to connect only from a host in one of the named ingress host groups.</dd> +<dt><em>connectionAllowDefault</em> (boolean)</dt> +<dd>Unrestricted users, those who are not members of a defined user group, are allowed to connect to this application. Unrestricted users are assigned to the ‘default’ user group and receive ‘default’ settings.</dd> +<dt><em>settings</em> (map)</dt> +<dd>A map where each key is a user group name and the value is a map of the corresponding settings for that group.</dd> +</dl> +</div> </div> <div class="section" id="see-also"> <h2>See also<a class="headerlink" href="#see-also" title="Permalink to this headline">.</a></h2>
Modified: qpid/site/input/releases/qpid-dispatch-master/man/qdrouterd.html.in URL: http://svn.apache.org/viewvc/qpid/site/input/releases/qpid-dispatch-master/man/qdrouterd.html.in?rev=1737854&r1=1737853&r2=1737854&view=diff ============================================================================== --- qpid/site/input/releases/qpid-dispatch-master/man/qdrouterd.html.in (original) +++ qpid/site/input/releases/qpid-dispatch-master/man/qdrouterd.html.in Tue Apr 5 17:01:10 2016 @@ -1,4 +1,5 @@ + <div class="section" id="qdrouterd-manual-page"> <h1>qdrouterd manual page<a class="headerlink" href="#qdrouterd-manual-page" title="Permalink to this headline">.</a></h1> Modified: qpid/site/input/releases/qpid-dispatch-master/man/qdstat.html.in URL: http://svn.apache.org/viewvc/qpid/site/input/releases/qpid-dispatch-master/man/qdstat.html.in?rev=1737854&r1=1737853&r2=1737854&view=diff ============================================================================== --- qpid/site/input/releases/qpid-dispatch-master/man/qdstat.html.in (original) +++ qpid/site/input/releases/qpid-dispatch-master/man/qdstat.html.in Tue Apr 5 17:01:10 2016 @@ -1,4 +1,5 @@ + <div class="section" id="qdstat-manual-page"> <h1>qdstat manual page<a class="headerlink" href="#qdstat-manual-page" title="Permalink to this headline">.</a></h1> @@ -14,45 +15,19 @@ as memory use.</p> </div> <div class="section" id="options"> <h2>Options<a class="headerlink" href="#options" title="Permalink to this headline">.</a></h2> -<p>-h, –help -: show this help message and exit</p> -<p>–version -: Print version and exit.</p> -<p>-g, –general -: Show General Router Stats</p> -<p>-c, –connections -: Show Connections</p> -<p>-l, –links -: Show Router Links</p> -<p>-n, –nodes -: Show Router Nodes</p> -<p>-a, –address -: Show Router Addresses</p> -<p>-m, –memory -: Show Broker Memory Stats</p> -<p>-v, –verbose -: Show maximum detail</p> -<p>–log -: Show recent log entries</p> -<p>–limit=LIMIT -: Limit number of log entries</p> -<div class="section" id="connection-options"> -<h3>Connection Options<a class="headerlink" href="#connection-options" title="Permalink to this headline">.</a></h3> -<p>-b URL, –bus=URL -: URL of the messaging bus to connect to (default 0.0.0.0)</p> -<p>-r ROUTER-ID, –router=ROUTER-ID -: Router to be queried</p> -<p>-t SECS, –timeout=SECS -: Maximum time to wait for connection in seconds (default 5)</p> -<p>–ssl-certificate=CERT -: Client SSL certificate (PEM Format)</p> -<p>–ssl-key=KEY -: Client SSL private key (PEM Format)</p> -<p>–ssl-trustfile=TRUSTED-CA-DB -: Trusted Certificate Authority Database file (PEM Format)</p> -<p>–ssl-password=PASSWORD -: Certificate password, will be prompted if not specifed.</p> -</div> +<p>Command ‘[‘/tmp/ross/transom/qpid-dispatch-master/tools/qdstat’, ‘–help’]’ returned non-zero exit status 1</p> +<dl class="docutils"> +<dt>Traceback (most recent call last):</dt> +<dd><dl class="first last docutils"> +<dt>File “/tmp/ross/transom/qpid-dispatch-master/tools/qdstat”, line 30, in <module></dt> +<dd>from qpid_dispatch.management.client import Url, Node, Entity</dd> +<dt>File “/tmp/ross/transom/qpid-dispatch-master/python/qpid_dispatch/management/client.py”, line 25, in <module></dt> +<dd>import proton</dd> +</dl> +</dd> +</dl> +<p>ImportError: No module named proton</p> +<p>Run python script ‘/tmp/ross/transom/qpid-dispatch-master/doc/man/help2rst.py’:CalledProcessError: Command ‘[‘/tmp/ross/transom/qpid-dispatch-master/tools/qdstat’, ‘–help’]’ returned non-zero exit status 1</p> </div> <div class="section" id="see-also"> <h2>See also<a class="headerlink" href="#see-also" title="Permalink to this headline">.</a></h2> Modified: qpid/site/python/generate.py URL: http://svn.apache.org/viewvc/qpid/site/python/generate.py?rev=1737854&r1=1737853&r2=1737854&view=diff ============================================================================== --- qpid/site/python/generate.py (original) +++ qpid/site/python/generate.py Tue Apr 5 17:01:10 2016 @@ -61,7 +61,7 @@ def setup_release_script(): call("gcc --version > /dev/null") call("make --version > /dev/null") call("rdoc --version > /dev/null") - call("sphinx-build --version > /dev/null") + call("which sphinx-build > /dev/null") call("svn --version > /dev/null") call("which javadoc > /dev/null") call("xsltproc --version > /dev/null") --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
