Skip to content

Commit 6220f4a

Browse files
rotated8McClain Looney
and
McClain Looney
authored
Adds Solr Auth (#54)
Adds Solr Auth First pass at adding and using Solr Auth. Does not use `blockunknown`. Co-authored-by: McClain Looney <[email protected]>
1 parent d5abe94 commit 6220f4a

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

src/commands/install_solr_core.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@ steps:
2828
fi
2929
fi
3030
zip -1 -r solr_conf.zip ./*
31-
curl -H "Content-type:application/octet-stream" --data-binary @solr_conf.zip "http://localhost:<< parameters.solr_port >>/solr/admin/configs?action=UPLOAD&name=solrconfig"
32-
curl -H 'Content-type: application/json' http://localhost:<< parameters.solr_port >>/api/collections/ -d '{create: {name: << parameters.core_name >>, config: solrconfig, numShards: 1}}'
31+
curl -H "Content-type:application/octet-stream" --data-binary @solr_conf.zip "http://solr:[email protected]:<< parameters.solr_port >>/solr/admin/configs?action=UPLOAD&name=solrconfig"
32+
curl -H 'Content-type: application/json' http://solr:[email protected]:<< parameters.solr_port >>/api/collections/ -d '{create: {name: << parameters.core_name >>, config: solrconfig, numShards: 1}}'

src/executors/ruby_fcrepo_solr_redis_postgres.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,12 @@ docker:
2626
- image: samvera/fcrepo4:<< parameters.fcrepo_version >>
2727
environment:
2828
CATALINA_OPTS: "-Djava.awt.headless=true -Dfile.encoding=UTF-8 -server -Xms512m -Xmx1024m -XX:NewSize=256m -XX:MaxNewSize=256m -XX:PermSize=256m -XX:MaxPermSize=256m -XX:+DisableExplicitGC"
29+
- image: zookeeper:3.4
2930
- image: solr:<< parameters.solr_version >>
30-
command: bin/solr -cloud -noprompt -f -p << parameters.solr_port >>
31+
environment:
32+
VERBOSE: yes
33+
SECURITY_JSON: '{"authentication":{"blockUnknown": false, "class":"solr.BasicAuthPlugin", "credentials":{"solr":"IV0EHq1OnNrj6gvRCwvFwTrZ1+z1oBbnQdiVC3otuq0= Ndd7LKvVBAaZIF0QAVi1ekCfAJXr1GGfLtRUXhgrF8c="}, "realm":"My Solr users", "forwardCredentials": false}, "authorization":{ "class":"solr.RuleBasedAuthorizationPlugin", "permissions":[{"name":"security-edit", "role":"admin"}], "user-role":{"solr":"admin"}}}'
34+
command: sh -c "server/scripts/cloud-scripts/zkcli.sh -zkhost localhost:2181 -cmd put /security.json \"${SECURITY_JSON}\" && solr-fg -cloud -noprompt -p << parameters.solr_port >> -z localhost:2181"
3135
- image: redis:<< parameters.redis_version >>
3236
- image: cimg/postgres:<< parameters.postgres_version >>
3337
environment:

0 commit comments

Comments
 (0)