diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/install/rpm/glacier2router.conf | 15 | ||||
| -rwxr-xr-x | cpp/install/rpm/glacier2router.redhat | 4 | ||||
| -rwxr-xr-x | cpp/install/rpm/icegridnode.redhat | 4 | ||||
| -rw-r--r-- | cpp/install/rpm/icegridregistry.conf | 2 | ||||
| -rwxr-xr-x | cpp/install/rpm/icegridregistry.redhat | 4 | ||||
| -rw-r--r-- | cpp/install/windows/glacier2router.cfg | 2 | ||||
| -rw-r--r-- | cpp/install/windows/icegridregistry.cfg | 2 |
7 files changed, 17 insertions, 16 deletions
diff --git a/cpp/install/rpm/glacier2router.conf b/cpp/install/rpm/glacier2router.conf index 1b475bf47a1..ede2f8556a9 100644 --- a/cpp/install/rpm/glacier2router.conf +++ b/cpp/install/rpm/glacier2router.conf @@ -22,10 +22,11 @@ Ice.ThreadPerConnection.StackSize=262144 # The client-visible endpoint of Glacier2. This should be an endpoint # visible from the public Internet, and it should be secure. # IANA-registered TCP ports for the Glacier2 router: -# - 4063 (unsecure) +# - 4063 (insecure) # - 4064 (secure, using SSL) # -Glacier2.Client.Endpoints=ssl -p 4064 -h 127.0.0.1 +Glacier2.Client.Endpoints=tcp -p 4063 -h 127.0.0.1 +#Glacier2.Client.Endpoints=ssl -p 4064 -h 127.0.0.1 # # The server-visible endpoint of Glacier2. This endpoint is only @@ -103,10 +104,10 @@ Ice.Warn.Connections=1 # # SSL Configuration # -Ice.Plugin.IceSSL=IceSSL:createIceSSL +#Ice.Plugin.IceSSL=IceSSL:createIceSSL -IceSSL.DefaultDir=/usr/share/Ice-@ver@/certs +IceSSL.DefaultDir=<path to certs dir> -IceSSL.CertAuthFile=cacert.pem -IceSSL.CertFile=s_rsa1024_pub.pem -IceSSL.KeyFile=s_rsa1024_priv.pem +#IceSSL.CertAuthFile=cacert.pem +#IceSSL.CertFile=s_rsa1024_pub.pem +#IceSSL.KeyFile=s_rsa1024_priv.pem diff --git a/cpp/install/rpm/glacier2router.redhat b/cpp/install/rpm/glacier2router.redhat index 6bb16317514..ca11ca554b5 100755 --- a/cpp/install/rpm/glacier2router.redhat +++ b/cpp/install/rpm/glacier2router.redhat @@ -29,7 +29,7 @@ prog="/usr/bin/glacier2router" progbase=${prog##*/} pidfile=/var/run/$progbase.pid -options="--daemon --pidfile=$pidfile --Ice.Config=$routerconf" +options="--daemon --pidfile $pidfile --Ice.Config=$routerconf" RETVAL=0 @@ -56,7 +56,7 @@ start() { stop() { echo -n $"Shutting down $progbase: " - killproc -p $pidfile $prog + killproc $prog RETVAL=$? echo [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$progbase diff --git a/cpp/install/rpm/icegridnode.redhat b/cpp/install/rpm/icegridnode.redhat index ebd56f01c7e..037a8233d52 100755 --- a/cpp/install/rpm/icegridnode.redhat +++ b/cpp/install/rpm/icegridnode.redhat @@ -30,7 +30,7 @@ prog="/usr/bin/icegridnode" progbase=${prog##*/} pidfile=/var/run/$progbase.pid -options="--daemon --pidfile=$pidfile --Ice.Config=$nodeconf" +options="--daemon --pidfile $pidfile --Ice.Config=$nodeconf" RETVAL=0 @@ -57,7 +57,7 @@ start() { stop() { echo -n $"Shutting down $progbase: " - killproc -p $pidfile $prog + killproc $prog RETVAL=$? echo [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$progbase diff --git a/cpp/install/rpm/icegridregistry.conf b/cpp/install/rpm/icegridregistry.conf index 83253c51819..7280a4da751 100644 --- a/cpp/install/rpm/icegridregistry.conf +++ b/cpp/install/rpm/icegridregistry.conf @@ -12,7 +12,7 @@ IceGrid.InstanceName=SampleIceGrid # Client object adapter: listens on all interfaces # (add -h <name | IP address> to listen on just one interface) # IANA-registered TCP ports for the IceGrid registry: -# - 4061 (unsecure) +# - 4061 (insecure) # - 4062 (secure, using SSL) # IceGrid.Registry.Client.Endpoints=tcp -p 4061 diff --git a/cpp/install/rpm/icegridregistry.redhat b/cpp/install/rpm/icegridregistry.redhat index 8b9022529c0..8b07116e7d0 100755 --- a/cpp/install/rpm/icegridregistry.redhat +++ b/cpp/install/rpm/icegridregistry.redhat @@ -32,7 +32,7 @@ prog="/usr/bin/icegridregistry" progbase=${prog##*/} pidfile=/var/run/$progbase.pid -options="--daemon --pidfile=$pidfile --Ice.Config=$registryconf" +options="--daemon --pidfile $pidfile --Ice.Config=$registryconf" RETVAL=0 @@ -59,7 +59,7 @@ start() { stop() { echo -n $"Shutting down $progbase: " - killproc -p $pidfile $prog + killproc $prog RETVAL=$? echo [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$progbase diff --git a/cpp/install/windows/glacier2router.cfg b/cpp/install/windows/glacier2router.cfg index 068b0920c37..1fbc752d8b9 100644 --- a/cpp/install/windows/glacier2router.cfg +++ b/cpp/install/windows/glacier2router.cfg @@ -22,7 +22,7 @@ Ice.ThreadPerConnection.StackSize=262144 # The client-visible endpoint of Glacier2. This should be an endpoint
# visible from the public Internet, and it should be secure.
# IANA-registered TCP ports for the Glacier2 router:
-# - 4063 (unsecure)
+# - 4063 (insecure)
# - 4064 (secure, using SSL)
#
Glacier2.Client.Endpoints=ssl -p 4064 -h 127.0.0.1
diff --git a/cpp/install/windows/icegridregistry.cfg b/cpp/install/windows/icegridregistry.cfg index 10e364c8a3d..4508bbc1439 100644 --- a/cpp/install/windows/icegridregistry.cfg +++ b/cpp/install/windows/icegridregistry.cfg @@ -12,7 +12,7 @@ IceGrid.InstanceName=SampleIceGrid # Client object adapter: listens on all interfaces
# (add -h <name | IP address> to listen on just one interface)
# IANA-registered TCP ports for the IceGrid registry:
-# - 4061 (unsecure)
+# - 4061 (insecure)
# - 4062 (secure, using SSL)
#
IceGrid.Registry.Client.Endpoints=tcp -p 4061
|