Skip to content

Commit 1fc1121

Browse files
committed
fix possibly in for chef/chef-server#50, testing
1 parent 5747b6f commit 1fc1121

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

install/mu_setup

+6-5
Original file line numberDiff line numberDiff line change
@@ -1325,6 +1325,7 @@ nginx['ssl_protocols'] = "TLSv1 TLSv1.1 TLSv1.2"
13251325
nginx['ssl_certificate'] = "$MU_SSL_CERT"
13261326
nginx['ssl_certificate_key'] = "$MU_SSL_KEY"
13271327
bookshelf['external_url'] = "https://"+server_name+":7443"
1328+
bookshelf['vip_port'] = 7443
13281329
EOF
13291330
if [ ! -f /etc/opscode/chef-server.rb -o "`diff /etc/opscode/chef-server.rb /etc/opscode/chef-server.rb.tmp.$$`" != "" ];then
13301331
/bin/mv -f /etc/opscode/chef-server.rb.tmp.$$ /etc/opscode/chef-server.rb
@@ -1335,11 +1336,11 @@ EOF
13351336

13361337
# XXX workaround for vile chef bug, see:
13371338
# 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
13431344

13441345
set_knife_rb organizations/mu mu "https://${CHEF_PUBLIC_IP}:7443"
13451346
/opt/chef/bin/knife ssl fetch -s https://$CHEF_PUBLIC_IP:7443 > /dev/null 2>&1

0 commit comments

Comments
 (0)