You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2018/04/15 21:34:17 UTC
[2/3] qpid-broker-j git commit: QPID-8166: Remove etc/passwd and
groups from distribution
QPID-8166: Remove etc/passwd and groups from distribution
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/0710c153
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/0710c153
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/0710c153
Branch: refs/heads/master
Commit: 0710c1530f3d930812659a7117575fca629c3e8c
Parents: f098ca3
Author: Keith Wall <kw...@apache.org>
Authored: Sat Apr 14 11:21:26 2018 +0100
Committer: Keith Wall <kw...@apache.org>
Committed: Sun Apr 15 22:33:02 2018 +0100
----------------------------------------------------------------------
apache-qpid-broker-j/src/main/assembly/bin.xml | 9 ------
.../src/main/resources/initial-config.json | 14 ++++++----
broker/etc/groups | 29 --------------------
broker/etc/md5passwd | 23 ----------------
broker/etc/passwd | 25 -----------------
5 files changed, 9 insertions(+), 91 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/0710c153/apache-qpid-broker-j/src/main/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/apache-qpid-broker-j/src/main/assembly/bin.xml b/apache-qpid-broker-j/src/main/assembly/bin.xml
index 94defd4..fe7484d 100644
--- a/apache-qpid-broker-j/src/main/assembly/bin.xml
+++ b/apache-qpid-broker-j/src/main/assembly/bin.xml
@@ -49,15 +49,6 @@
<fileMode>0755</fileMode>
<directoryMode>0755</directoryMode>
</fileSet>
- <fileSet>
- <directory>${project.basedir}/../broker</directory>
- <outputDirectory/>
- <includes>
- <include>etc/</include>
- </includes>
- <fileMode>0644</fileMode>
- <directoryMode>0755</directoryMode>
- </fileSet>
</fileSets>
<dependencySets>
<dependencySet>
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/0710c153/broker-core/src/main/resources/initial-config.json
----------------------------------------------------------------------
diff --git a/broker-core/src/main/resources/initial-config.json b/broker-core/src/main/resources/initial-config.json
index 58477d2..512eaf5 100644
--- a/broker-core/src/main/resources/initial-config.json
+++ b/broker-core/src/main/resources/initial-config.json
@@ -22,9 +22,13 @@
"name": "${broker.name}",
"modelVersion": "7.0",
"authenticationproviders" : [ {
- "name" : "passwordFile",
- "type" : "PlainPasswordFile",
- "path" : "${qpid.home_dir}${file.separator}etc${file.separator}passwd"
+ "name" : "plain",
+ "type" : "Plain",
+ "users" : [ {
+ "name" : "guest",
+ "type" : "managed",
+ "password" : "guest"
+ } ]
} ],
"brokerloggers" : [ {
"name" : "logfile",
@@ -79,7 +83,7 @@
"ports" : [ {
"name" : "AMQP",
"port" : "${qpid.amqp_port}",
- "authenticationProvider" : "passwordFile",
+ "authenticationProvider" : "plain",
"virtualhostaliases" : [ {
"name" : "nameAlias",
"type" : "nameAlias"
@@ -93,7 +97,7 @@
}, {
"name" : "HTTP",
"port" : "${qpid.http_port}",
- "authenticationProvider" : "passwordFile",
+ "authenticationProvider" : "plain",
"protocols" : [ "HTTP" ]
}],
"virtualhostnodes" : [ {
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/0710c153/broker/etc/groups
----------------------------------------------------------------------
diff --git a/broker/etc/groups b/broker/etc/groups
deleted file mode 100644
index e3912ec..0000000
--- a/broker/etc/groups
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-#
-# To define a group, use the format:
-#
-# <groupname>.users=<user1>,<user2>,...,<usern>
-#
-
-messaging-users.users=guest,client,server
-administrators.users=admin
-webadmins.users=webadmin
-
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/0710c153/broker/etc/md5passwd
----------------------------------------------------------------------
diff --git a/broker/etc/md5passwd b/broker/etc/md5passwd
deleted file mode 100644
index f7185c0..0000000
--- a/broker/etc/md5passwd
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-guest:CE4DQ6BIb/BVMN9scFyLtA==
-client:CE4DQ6BIb/BVMN9scFyLtA==
-server:CE4DQ6BIb/BVMN9scFyLtA==
-admin:ISMvKXpXpadDiUoOSoAfww==
-webadmin:rda7WOE5vhAzJNBNgtj1RQ==
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/0710c153/broker/etc/passwd
----------------------------------------------------------------------
diff --git a/broker/etc/passwd b/broker/etc/passwd
deleted file mode 100644
index f0dcb80..0000000
--- a/broker/etc/passwd
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-guest:guest
-client:guest
-server:guest
-admin:admin
-
-webadmin:webadmin
-
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org