@@ -1325,6 +1325,7 @@ nginx['ssl_protocols'] = "TLSv1 TLSv1.1 TLSv1.2"
1325
1325
nginx['ssl_certificate'] = "$MU_SSL_CERT "
1326
1326
nginx['ssl_certificate_key'] = "$MU_SSL_KEY "
1327
1327
bookshelf['external_url'] = "https://"+server_name+":7443"
1328
+ bookshelf['vip_port'] = 7443
1328
1329
EOF
1329
1330
if [ ! -f /etc/opscode/chef-server.rb -o " ` diff /etc/opscode/chef-server.rb /etc/opscode/chef-server.rb.tmp.$$ ` " != " " ]; then
1330
1331
/bin/mv -f /etc/opscode/chef-server.rb.tmp.$$ /etc/opscode/chef-server.rb
@@ -1335,11 +1336,11 @@ EOF
1335
1336
1336
1337
# XXX workaround for vile chef bug, see:
1337
1338
# https://github.com/chef/chef-server/issues/50
1338
- if ! grep " s3_url, \" https:\/\/${HOSTNAME} .platform-mu:7443\" " /var/opt/opscode/opscode-erchef/sys.config > /dev/null; then
1339
- status_message " Switching ${BOLD} Chef Server${NORM} to port ${BOLD} 7443${NORM} "
1340
- /bin/sed -i " s/s3_url, \" https:\/\/${HOSTNAME} .platform-mu\" /s3_url, \" https:\/\/${HOSTNAME} .platform-mu:7443\" /" /var/opt/opscode/opscode-erchef/sys.config
1341
- chef_server_ctl restart
1342
- fi
1339
+ # if ! grep "s3_url, \"https:\/\/${HOSTNAME}.platform-mu:7443\"" /var/opt/opscode/opscode-erchef/sys.config > /dev/null;then
1340
+ # status_message "Switching ${BOLD}Chef Server${NORM} to port ${BOLD}7443${NORM}"
1341
+ # /bin/sed -i "s/s3_url, \"https:\/\/${HOSTNAME}.platform-mu\"/s3_url, \"https:\/\/${HOSTNAME}.platform-mu:7443\"/" /var/opt/opscode/opscode-erchef/sys.config
1342
+ # chef_server_ctl restart
1343
+ # fi
1343
1344
1344
1345
set_knife_rb organizations/mu mu " https://${CHEF_PUBLIC_IP} :7443"
1345
1346
/opt/chef/bin/knife ssl fetch -s https://$CHEF_PUBLIC_IP :7443 > /dev/null 2>&1
0 commit comments