You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by de...@apache.org on 2018/08/10 15:48:49 UTC
[trafficcontrol] 01/08: move context to allow to-access.sh funcs in
all containers
This is an automated email from the ASF dual-hosted git repository.
dewrich pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
commit 31d1e1dcdf8cca8d34f3c8597da41c2efd66f014
Author: Dan Kirkwood <da...@apache.org>
AuthorDate: Wed Aug 8 12:59:51 2018 -0600
move context to allow to-access.sh funcs in all containers
---
infrastructure/cdn-in-a-box/docker-compose.yml | 14 +-
infrastructure/cdn-in-a-box/traffic_ops/Dockerfile | 22 +-
.../cdn-in-a-box/traffic_ops/Dockerfile-go | 11 +-
.../cdn-in-a-box/traffic_ops/Dockerfile-init | 26 -
.../cdn-in-a-box/{ => traffic_ops}/to-access.sh | 0
.../cdn-in-a-box/traffic_vault/Dockerfile | 42 --
.../cdn-in-a-box/traffic_vault/riak.conf | 684 ---------------------
infrastructure/cdn-in-a-box/traffic_vault/run.sh | 125 ----
8 files changed, 29 insertions(+), 895 deletions(-)
diff --git a/infrastructure/cdn-in-a-box/docker-compose.yml b/infrastructure/cdn-in-a-box/docker-compose.yml
index 14e0bc1..6428728 100644
--- a/infrastructure/cdn-in-a-box/docker-compose.yml
+++ b/infrastructure/cdn-in-a-box/docker-compose.yml
@@ -67,8 +67,8 @@ services:
# defined below
trafficops:
build:
- context: traffic_ops
- dockerfile: Dockerfile-go
+ context: .
+ dockerfile: traffic_ops/Dockerfile-go
depends_on:
- db
- trafficops-perl
@@ -86,9 +86,10 @@ services:
# in place until all API endpoints have been rewritten in Go
trafficops-perl:
build:
- context: traffic_ops
+ context: .
+ dockerfile: traffic_ops/Dockerfile
args:
- TRAFFIC_OPS_RPM: traffic_ops.rpm
+ TRAFFIC_OPS_RPM: traffic_ops/traffic_ops.rpm
depends_on:
- db
domainname: cdn.local
@@ -124,9 +125,10 @@ services:
# trafficmonitor is an HTTP service that monitors the caches in a CDN for a variety of metrics
trafficmonitor:
build:
- context: traffic_monitor
+ context: .
+ dockerfile: traffic_monitor/Dockerfile
args:
- TRAFFIC_MONITOR_RPM: traffic_monitor.rpm
+ TRAFFIC_MONITOR_RPM: traffic_monitor/traffic_monitor.rpm
domainname: cdn.local
env_file:
- variables.env
diff --git a/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile b/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile
index 38f0990..85189de 100644
--- a/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile
+++ b/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile
@@ -38,7 +38,7 @@ RUN cpanm Carton
RUN yum install -y perl-DBIx-Connector
# Override TRAFFIC_OPS_RPM arg to use a different one using --build-arg TRAFFIC_OPS_RPM=... Can be local file or http://...
-ARG TRAFFIC_OPS_RPM=traffic_ops.rpm
+ARG TRAFFIC_OPS_RPM=traffic_ops/traffic_ops.rpm
ADD $TRAFFIC_OPS_RPM /
RUN yum install -y \
/$(basename $TRAFFIC_OPS_RPM) \
@@ -47,15 +47,14 @@ RUN yum install -y \
rm /$(basename $TRAFFIC_OPS_RPM) && \
yum clean all
-# if local.tar.gz exists, untar to .../app/local to keep carton from reinstalling the Perl universe
-# NOTE: copying Dockerfile so the COPY succeeds whether or not local.tar.gz exists
+# copy any dir structure in overrides to TO -- allows modification of the install and shortcut to get perl modules/goose installed
+COPY traffic_ops/overrides/ /opt/traffic_ops/.
+
WORKDIR /opt/traffic_ops/app
-COPY Dockerfile local.tar.gz /tmp/
+
# run carton whether or not local dir was installed
-RUN [ -f /tmp/local.tar.gz ] && \
- tar xzvf /tmp/local.tar.gz || true && \
- POSTGRES_HOME=/usr/pgsql-9.6 carton && \
+RUN POSTGRES_HOME=/usr/pgsql-9.6 carton && \
rm -rf $HOME/.cpan* /tmp/Dockerfile /tmp/local.tar.gz
RUN /opt/traffic_ops/install/bin/install_goose.sh
@@ -76,7 +75,10 @@ EXPOSE 6443
WORKDIR /opt/traffic_ops/app
ENV MOJO_MODE production
-ADD adduser.pl /
-ADD config.sh /
-ADD run.sh /
+ADD traffic_ops/run.sh \
+ traffic_ops/config.sh \
+ traffic_ops/adduser.pl \
+ traffic_ops/to-access.sh \
+ /
+
CMD /run.sh
diff --git a/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile-go b/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile-go
index 8186c97..5acf20c 100644
--- a/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile-go
+++ b/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile-go
@@ -31,6 +31,13 @@ COPY --from=trafficops-perl /opt/traffic_ops/app/bin/traffic_ops_golang /opt/tra
EXPOSE 6443
WORKDIR /opt/traffic_ops/app
-ADD config.sh run-go.sh setup.sh /
-ADD cdns.json deliveryservices.json mid_cachegroup.json edge_cachegroup.json phys_location.json /
+ADD traffic_ops/config.sh \
+ traffic_ops/run-go.sh \
+ traffic_ops/setup.sh \
+ traffic_ops/cdns.json \
+ traffic_ops/deliveryservices.json \
+ traffic_ops/mid_cachegroup.json \
+ traffic_ops/edge_cachegroup.json \
+ traffic_ops/phys_location.json \
+ /
CMD /run-go.sh
diff --git a/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile-init b/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile-init
deleted file mode 100644
index a24d78d..0000000
--- a/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile-init
+++ /dev/null
@@ -1,26 +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.
-
-############################################################
-# Dockerfile to initialize Traffic Ops
-############################################################
-
-FROM alpine
-
-RUN apk add --no-cache curl bash
-ADD init /
-CMD /trafficops-init.sh
diff --git a/infrastructure/cdn-in-a-box/to-access.sh b/infrastructure/cdn-in-a-box/traffic_ops/to-access.sh
similarity index 100%
rename from infrastructure/cdn-in-a-box/to-access.sh
rename to infrastructure/cdn-in-a-box/traffic_ops/to-access.sh
diff --git a/infrastructure/cdn-in-a-box/traffic_vault/Dockerfile b/infrastructure/cdn-in-a-box/traffic_vault/Dockerfile
deleted file mode 100644
index 48b1dfc..0000000
--- a/infrastructure/cdn-in-a-box/traffic_vault/Dockerfile
+++ /dev/null
@@ -1,42 +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.
-
-############################################################
-# Dockerfile to build Traffic Vault image
-# Based on CentOS 7.2
-############################################################
-FROM centos:7
-
-ARG ADMIN_PASS
-ARG USER_PASS
-
-# download and install Riak
-RUN curl -s https://packagecloud.io/install/repositories/basho/riak/script.rpm.sh | bash
-RUN yum -y install \
- epel-release && \
- yum -y install \
- initscripts \
- jq \
- nmap-ncat \
- riak && \
- yum -y clean all && \
- rm -rf /var/yum/cache
-
-EXPOSE 8098 8087 8088
-ADD to-access.sh /
-ADD traffic_vault/run.sh /
-ENTRYPOINT [ "./run.sh", "/to-access.sh" ]
diff --git a/infrastructure/cdn-in-a-box/traffic_vault/riak.conf b/infrastructure/cdn-in-a-box/traffic_vault/riak.conf
deleted file mode 100644
index c8d6a0a..0000000
--- a/infrastructure/cdn-in-a-box/traffic_vault/riak.conf
+++ /dev/null
@@ -1,684 +0,0 @@
-## Where to emit the default log messages (typically at 'info'
-## severity):
-## off: disabled
-## file: the file specified by log.console.file
-## console: to standard output (seen when using `riak attach-direct`)
-## both: log.console.file and standard out.
-##
-## Default: file
-##
-## Acceptable values:
-## - one of: off, file, console, both
-log.console = file
-
-## The severity level of the console log, default is 'info'.
-##
-## Default: info
-##
-## Acceptable values:
-## - one of: debug, info, notice, warning, error, critical, alert, emergency, none
-log.console.level = info
-
-## When 'log.console' is set to 'file' or 'both', the file where
-## console messages will be logged.
-##
-## Default: $(platform_log_dir)/console.log
-##
-## Acceptable values:
-## - the path to a file
-log.console.file = $(platform_log_dir)/console.log
-
-## The file where error messages will be logged.
-##
-## Default: $(platform_log_dir)/error.log
-##
-## Acceptable values:
-## - the path to a file
-log.error.file = $(platform_log_dir)/error.log
-
-## When set to 'on', enables log output to syslog.
-##
-## Default: off
-##
-## Acceptable values:
-## - on or off
-log.syslog = off
-
-## Whether to enable the crash log.
-##
-## Default: on
-##
-## Acceptable values:
-## - on or off
-log.crash = on
-
-## If the crash log is enabled, the file where its messages will
-## be written.
-##
-## Default: $(platform_log_dir)/crash.log
-##
-## Acceptable values:
-## - the path to a file
-log.crash.file = $(platform_log_dir)/crash.log
-
-## Maximum size in bytes of individual messages in the crash log
-##
-## Default: 64KB
-##
-## Acceptable values:
-## - a byte size with units, e.g. 10GB
-log.crash.maximum_message_size = 64KB
-
-## Maximum size of the crash log in bytes, before it is rotated
-##
-## Default: 10MB
-##
-## Acceptable values:
-## - a byte size with units, e.g. 10GB
-log.crash.size = 10MB
-
-## The schedule on which to rotate the crash log. For more
-## information see:
-## https://github.com/basho/lager/blob/master/README.md#internal-log-rotation
-##
-## Default: $D0
-##
-## Acceptable values:
-## - text
-log.crash.rotation = $D0
-
-## The number of rotated crash logs to keep. When set to
-## 'current', only the current open log file is kept.
-##
-## Default: 5
-##
-## Acceptable values:
-## - an integer
-## - the text "current"
-log.crash.rotation.keep = 5
-
-## Name of the Erlang node
-##
-## Default: riak@127.0.0.1
-##
-## Acceptable values:
-## - text
-nodename = riak@0.0.0.0
-
-## Cookie for distributed node communication. All nodes in the
-## same cluster should use the same cookie or they will not be able to
-## communicate.
-##
-## Default: riak
-##
-## Acceptable values:
-## - text
-distributed_cookie = riak
-
-## Sets the number of threads in async thread pool, valid range
-## is 0-1024. If thread support is available, the default is 64.
-## More information at: http://erlang.org/doc/man/erl.html
-##
-## Default: 64
-##
-## Acceptable values:
-## - an integer
-erlang.async_threads = 64
-
-## The number of concurrent ports/sockets
-## Valid range is 1024-134217727
-##
-## Default: 262144
-##
-## Acceptable values:
-## - an integer
-erlang.max_ports = 262144
-
-## Set scheduler forced wakeup interval. All run queues will be
-## scanned each Interval milliseconds. While there are sleeping
-## schedulers in the system, one scheduler will be woken for each
-## non-empty run queue found. An Interval of zero disables this
-## feature, which also is the default.
-## This feature is a workaround for lengthy executing native code, and
-## native code that do not bump reductions properly.
-## More information: http://www.erlang.org/doc/man/erl.html#+sfwi
-##
-## Default: 500
-##
-## Acceptable values:
-## - an integer
-## erlang.schedulers.force_wakeup_interval = 500
-
-## Enable or disable scheduler compaction of load. By default
-## scheduler compaction of load is enabled. When enabled, load
-## balancing will strive for a load distribution which causes as many
-## scheduler threads as possible to be fully loaded (i.e., not run out
-## of work). This is accomplished by migrating load (e.g. runnable
-## processes) into a smaller set of schedulers when schedulers
-## frequently run out of work. When disabled, the frequency with which
-## schedulers run out of work will not be taken into account by the
-## load balancing logic.
-## More information: http://www.erlang.org/doc/man/erl.html#+scl
-##
-## Default: false
-##
-## Acceptable values:
-## - one of: true, false
-## erlang.schedulers.compaction_of_load = false
-
-## Enable or disable scheduler utilization balancing of load. By
-## default scheduler utilization balancing is disabled and instead
-## scheduler compaction of load is enabled which will strive for a
-## load distribution which causes as many scheduler threads as
-## possible to be fully loaded (i.e., not run out of work). When
-## scheduler utilization balancing is enabled the system will instead
-## try to balance scheduler utilization between schedulers. That is,
-## strive for equal scheduler utilization on all schedulers.
-## More information: http://www.erlang.org/doc/man/erl.html#+sub
-##
-## Acceptable values:
-## - one of: true, false
-## erlang.schedulers.utilization_balancing = true
-
-## Number of partitions in the cluster (only valid when first
-## creating the cluster). Must be a power of 2, minimum 8 and maximum
-## 1024.
-##
-## Default: 64
-##
-## Acceptable values:
-## - an integer
-## ring_size = 64
-
-## Number of concurrent node-to-node transfers allowed.
-##
-## Default: 2
-##
-## Acceptable values:
-## - an integer
-## transfer_limit = 2
-
-## Default cert location for https can be overridden
-## with the ssl config variable, for example:
-##
-## Acceptable values:
-## - the path to a file
-ssl.certfile = /etc/riak/certs/cert.pem
-
-## Default key location for https can be overridden with the ssl
-## config variable, for example:
-##
-## Acceptable values:
-## - the path to a file
-ssl.keyfile = /etc/riak/certs/key.pem
-
-## Default signing authority location for https can be overridden
-## with the ssl config variable, for example:
-##
-## Acceptable values:
-## - the path to a file
-ssl.cacertfile = /etc/riak/certs/cacertfile.pem
-
-## DTrace support Do not enable 'dtrace' unless your Erlang/OTP
-## runtime is compiled to support DTrace. DTrace is available in
-## R15B01 (supported by the Erlang/OTP official source package) and in
-## R14B04 via a custom source repository & branch.
-##
-## Default: off
-##
-## Acceptable values:
-## - on or off
-dtrace = off
-
-## Platform-specific installation paths (substituted by rebar)
-##
-## Default: /usr/sbin
-##
-## Acceptable values:
-## - the path to a directory
-platform_bin_dir = /usr/sbin
-
-##
-## Default: /var/lib/riak
-##
-## Acceptable values:
-## - the path to a directory
-platform_data_dir = /var/lib/riak
-
-##
-## Default: /etc/riak
-##
-## Acceptable values:
-## - the path to a directory
-platform_etc_dir = /etc/riak
-
-##
-## Default: /usr/lib64/riak/lib
-##
-## Acceptable values:
-## - the path to a directory
-platform_lib_dir = /usr/lib64/riak/lib
-
-##
-## Default: /var/log/riak
-##
-## Acceptable values:
-## - the path to a directory
-platform_log_dir = /var/log/riak
-
-## Enable consensus subsystem. Set to 'on' to enable the
-## consensus subsystem used for strongly consistent Riak operations.
-##
-## Default: off
-##
-## Acceptable values:
-## - on or off
-## strong_consistency = on
-
-## listener.http.<name> is an IP address and TCP port that the Riak
-## HTTP interface will bind.
-##
-## Default: 127.0.0.1:8098
-##
-## Acceptable values:
-## - an IP/port pair, e.g. 127.0.0.1:10011
-listener.http.internal = 0.0.0.0:8098
-
-## listener.protobuf.<name> is an IP address and TCP port that the Riak
-## Protocol Buffers interface will bind.
-##
-## Default: 127.0.0.1:8087
-##
-## Acceptable values:
-## - an IP/port pair, e.g. 127.0.0.1:10011
-listener.protobuf.internal = 0.0.0.0:8087
-
-## The maximum length to which the queue of pending connections
-## may grow. If set, it must be an integer > 0. If you anticipate a
-## huge number of connections being initialized *simultaneously*, set
-## this number higher.
-##
-## Default: 128
-##
-## Acceptable values:
-## - an integer
-## protobuf.backlog = 128
-
-## listener.https.<name> is an IP address and TCP port that the Riak
-## HTTPS interface will bind.
-##
-## Acceptable values:
-## - an IP/port pair, e.g. 127.0.0.1:10011
-listener.https.internal = 0.0.0.0:8088
-
-## How Riak will repair out-of-sync keys. Some features require
-## this to be set to 'active', including search.
-## * active: out-of-sync keys will be repaired in the background
-## * passive: out-of-sync keys are only repaired on read
-## * active-debug: like active, but outputs verbose debugging
-## information
-##
-## Default: active
-##
-## Acceptable values:
-## - one of: active, passive, active-debug
-anti_entropy = active
-
-## Specifies the storage engine used for Riak's key-value data
-## and secondary indexes (if supported).
-##
-## Default: bitcask
-##
-## Acceptable values:
-## - one of: bitcask, leveldb, memory, multi, prefix_multi
-storage_backend = bitcask
-
-## Simplify prefix_multi configuration for Riak CS. Keep this
-## commented out unless Riak is configured for Riak CS.
-##
-## Acceptable values:
-## - an integer
-## cs_version = 20000
-
-## Controls which binary representation of a riak value is stored
-## on disk.
-## * 0: Original erlang:term_to_binary format. Higher space overhead.
-## * 1: New format for more compact storage of small values.
-##
-## Default: 1
-##
-## Acceptable values:
-## - the integer 1
-## - the integer 0
-object.format = 1
-
-## Reading or writing objects bigger than this size will write a
-## warning in the logs.
-##
-## Default: 5MB
-##
-## Acceptable values:
-## - a byte size with units, e.g. 10GB
-object.size.warning_threshold = 5MB
-
-## Writing an object bigger than this will send a failure to the
-## client.
-##
-## Default: 50MB
-##
-## Acceptable values:
-## - a byte size with units, e.g. 10GB
-object.size.maximum = 50MB
-
-## Writing an object with more than this number of siblings will
-## generate a warning in the logs.
-##
-## Default: 25
-##
-## Acceptable values:
-## - an integer
-object.siblings.warning_threshold = 25
-
-## Writing an object with more than this number of siblings will
-## send a failure to the client.
-##
-## Default: 100
-##
-## Acceptable values:
-## - an integer
-object.siblings.maximum = 100
-
-## Whether to allow list buckets.
-##
-## Default: enabled
-##
-## Acceptable values:
-## - enabled or disabled
-## cluster.job.riak_kv.list_buckets = enabled
-
-## Whether to allow streaming list buckets.
-##
-## Default: enabled
-##
-## Acceptable values:
-## - enabled or disabled
-## cluster.job.riak_kv.stream_list_buckets = enabled
-
-## Whether to allow list keys.
-##
-## Default: enabled
-##
-## Acceptable values:
-## - enabled or disabled
-## cluster.job.riak_kv.list_keys = enabled
-
-## Whether to allow streaming list keys.
-##
-## Default: enabled
-##
-## Acceptable values:
-## - enabled or disabled
-## cluster.job.riak_kv.stream_list_keys = enabled
-
-## Whether to allow secondary index queries.
-##
-## Default: enabled
-##
-## Acceptable values:
-## - enabled or disabled
-## cluster.job.riak_kv.secondary_index = enabled
-
-## Whether to allow streaming secondary index queries.
-##
-## Default: enabled
-##
-## Acceptable values:
-## - enabled or disabled
-## cluster.job.riak_kv.stream_secondary_index = enabled
-
-## Whether to allow term-based map-reduce.
-##
-## Default: enabled
-##
-## Acceptable values:
-## - enabled or disabled
-## cluster.job.riak_kv.map_reduce = enabled
-
-## Whether to allow JavaScript map-reduce.
-##
-## Default: enabled
-##
-## Acceptable values:
-## - enabled or disabled
-## cluster.job.riak_kv.map_reduce_js = enabled
-
-## A path under which bitcask data files will be stored.
-##
-## Default: $(platform_data_dir)/bitcask
-##
-## Acceptable values:
-## - the path to a directory
-bitcask.data_root = $(platform_data_dir)/bitcask
-
-## Configure how Bitcask writes data to disk.
-## erlang: Erlang's built-in file API
-## nif: Direct calls to the POSIX C API
-## The NIF mode provides higher throughput for certain
-## workloads, but has the potential to negatively impact
-## the Erlang VM, leading to higher worst-case latencies
-## and possible throughput collapse.
-##
-## Default: erlang
-##
-## Acceptable values:
-## - one of: erlang, nif
-bitcask.io_mode = erlang
-
-## Set to 'off' to disable the admin panel.
-##
-## Default: off
-##
-## Acceptable values:
-## - on or off
-riak_control = off
-
-## Authentication mode used for access to the admin panel.
-##
-## Default: off
-##
-## Acceptable values:
-## - one of: off, userlist
-riak_control.auth.mode = off
-
-## If riak control's authentication mode (riak_control.auth.mode)
-## is set to 'userlist' then this is the list of usernames and
-## passwords for access to the admin panel.
-## To create users with given names, add entries of the format:
-## riak_control.auth.user.USERNAME.password = PASSWORD
-## replacing USERNAME with the desired username and PASSWORD with the
-## desired password for that user.
-##
-## Acceptable values:
-## - text
-## riak_control.auth.user.admin.password = pass
-
-## This parameter defines the percentage of total server memory
-## to assign to LevelDB. LevelDB will dynamically adjust its internal
-## cache sizes to stay within this size. The memory size can
-## alternately be assigned as a byte count via leveldb.maximum_memory
-## instead.
-##
-## Default: 70
-##
-## Acceptable values:
-## - an integer
-leveldb.maximum_memory.percent = 70
-
-## Enables or disables the compression of data on disk.
-## Enabling (default) saves disk space. Disabling may reduce read
-## latency but increase overall disk activity. Option can be
-## changed at any time, but will not impact data on disk until
-## next time a file requires compaction.
-##
-## Default: on
-##
-## Acceptable values:
-## - on or off
-leveldb.compression = on
-
-## Selection of compression algorithms. snappy is
-## original compression supplied for leveldb. lz4 is new
-## algorithm that compresses to similar volume but averages twice
-## as fast on writes and four times as fast on reads.
-##
-## Acceptable values:
-## - one of: snappy, lz4
-leveldb.compression.algorithm = lz4
-
-##
-## Default: on
-##
-## Acceptable values:
-## - on or off
-## multi_backend.name.leveldb.compression = on
-
-##
-## Acceptable values:
-## - one of: snappy, lz4
-## multi_backend.name.leveldb.compression.algorithm = lz4
-
-## Whether to allow search queries.
-##
-## Default: enabled
-##
-## Acceptable values:
-## - enabled or disabled
-## cluster.job.riak_search.query = enabled
-
-## To enable Search set this 'on'.
-##
-## Default: off
-##
-## Acceptable values:
-## - on or off
-search = off
-
-## How long Riak will wait for Solr to start. The start sequence
-## will be tried twice. If both attempts timeout, then the Riak node
-## will be shutdown. This may need to be increased as more data is
-## indexed and Solr takes longer to start. Values lower than 1s will
-## be rounded up to the minimum 1s.
-##
-## Default: 30s
-##
-## Acceptable values:
-## - a time duration with units, e.g. '10s' for 10 seconds
-search.solr.start_timeout = 30s
-
-## The port number which Solr binds to.
-## NOTE: Binds on every interface.
-##
-## Default: 8093
-##
-## Acceptable values:
-## - an integer
-search.solr.port = 8093
-
-## The port number which Solr JMX binds to.
-## NOTE: Binds on every interface.
-##
-## Default: 8985
-##
-## Acceptable values:
-## - an integer
-search.solr.jmx_port = 8985
-
-## The options to pass to the Solr JVM. Non-standard options,
-## i.e. -XX, may not be portable across JVM implementations.
-## E.g. -XX:+UseCompressedStrings
-##
-## Default: -d64 -Xms1g -Xmx1g -XX:+UseStringCache -XX:+UseCompressedOops
-##
-## Acceptable values:
-## - text
-search.solr.jvm_options = -d64 -Xms1g -Xmx1g -XX:+UseStringCache -XX:+UseCompressedOops
-
-## The minimum batch size, in number of Riak objects. Any batches that
-## are smaller than this amount will not be immediately flushed to Solr,
-## but are guaranteed to be flushed within the
-## "search.queue.batch.flush_interval".
-##
-## Default: 10
-##
-## Acceptable values:
-## - an integer
-## search.queue.batch.minimum = 10
-
-## The maximum batch size, in number of Riak objects. Any batches that are
-## larger than this amount will be split, where the first
-## search.queue.batch.maximum set of objects will be flushed to Solr, and
-## the remaining objects enqueued for that index will be retained until the
-## next batch is delivered. This parameter ensures that at most
-## "search.queue.batch.maximum object" will be delivered into Solr in any
-## given request.
-##
-## Default: 500
-##
-## Acceptable values:
-## - an integer
-## search.queue.batch.maximum = 500
-
-## The maximum delay between notification to flush batches to Solr. This
-## setting is used to increase or decrease the frequency of batch delivery
-## into Solr, specifically for relatively low-volume input into Riak. This
-## setting ensures that data will be delivered into Solr in accordance with
-## the "search.queue.batch.minimum" and "search.queue.batch.maximum"
-## settings within the specified interval. Batches that are smaller than
-## "search.queue.batch.minimum" will be delivered to Solr within this
-## interval. This setting will generally hav no effect on heavily loaded
-## systems.
-##
-## Default: 500ms
-##
-## Acceptable values:
-## - a time duration with units, e.g. '10s' for 10 seconds
-## - the text "infinity"
-## search.queue.batch.flush_interval = 500ms
-
-## The queue high watermark. If the total number of queued messages in a
-## Solr Queue Worker instance exceeds this limit, then the calling vnode
-## will be blocked until the total number falls below this limit. This
-## parameter exercises flow control between Riak and the Riak
-## Search batching subsystem if writes into Solr start to fall behind.
-##
-## Default: 1000
-##
-## Acceptable values:
-## - an integer
-## search.queue.high_watermark = 1000
-
-## The strategy for how we handle purging when we hit the
-## search.queue.high_watermark.
-## - purge_one -> Removes the oldest item on the queue from an
-## erroring (references to fuses blown in the code) index in
-## order to get below the search.queue.high_watermark.
-## - purge_index -> Removes all items associated with one random
-## erroring (references to fuses blown in the code) index in
-## order to get below the search.queue.high_watermark.
-## - off -> purging is disabled
-##
-## Default: purge_one
-##
-## Acceptable values:
-## - one of: purge_one, purge_index, off
-## search.queue.high_watermark.purge_strategy = purge_one
-
-## Whether to allow Yokozuna queries on this node
-##
-## Default: enabled
-##
-## Acceptable values:
-## - enabled or disabled
-## cluster.job.yokozuna.query = enabled
-
-tls_protocols.tlsv1 = on
diff --git a/infrastructure/cdn-in-a-box/traffic_vault/run.sh b/infrastructure/cdn-in-a-box/traffic_vault/run.sh
deleted file mode 100755
index 7cc9625..0000000
--- a/infrastructure/cdn-in-a-box/traffic_vault/run.sh
+++ /dev/null
@@ -1,125 +0,0 @@
-#!/bin/bash
-# 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.
-
-# Script for running the Dockerfile for Traffic Vault.
-# The Dockerfile sets up a Docker image which can be used for any new container;
-# This script, which should be run when the container is run (it's the ENTRYPOINT), will configure the container.
-#
-# The following environment variables must be set (ordinarily by `docker run -e` arguments):
-# ADMIN_PASS
-# USER_PASS
-# CERT_COUNTRY
-# CERT_STATE
-# CERT_CITY
-# CERT_COMPANY
-# TO_URI
-# TO_USER
-# TO_PASS
-# DOMAIN
-# IP
-# GATEWAY
-# CREATE_TO_DB_ENTRY (If set to yes, create the TO db entry for this server if set to no, assume it it already there)
-
-set -e -x
-if [[ -f $1 ]]; then
- . "$1"
-else
- echo "Missing function definition file"
- exit 1
-fi
-
-start() {
- tail -f /dev/null
- /etc/init.d/riak restart
- exec tail -f /var/log/riak/console.log
-}
-
-
-init() {
- # Set the Riak certs in the config; generated in run.sh
- sed -i \
- -e 's%^## ssl.\(certfile\|keyfile\|cacertfile\) =%ssl.\1 =%' \
- -e 's%^## \(listener.https.internal\)%\1%g' \
- -e 's%$(platform_etc_dir)/%/etc/riak/certs/%' \
- -e "s%127.0.0.1%$(hostname -f)%g" \
- /etc/riak/riak.conf && \
- echo 'tls_protocols.tlsv1 = on' >> /etc/riak/riak.conf
-
- while ! nc $TO_HOST $TO_PORT </dev/null 2>/dev/null; do
- echo "Waiting for $TO_HOST"
- sleep 3
- done
-
- # test communication with traffic_ops
- to-get api/1.2/cdns | jq -S .response
-# TMP_IP=$IP
-# TMP_DOMAIN=$DOMAIN
-# TMP_GATEWAY=$GATEWAY
-#
-# echo "Got IP: $TMP_IP"
-# echo "Got Domain: $TMP_DOMAIN"
-# echo "Got Gateway: $TMP_GATEWAY"
-#
-# if [ "$CREATE_TO_DB_ENTRY" = "YES" ] ; then
-# TMP_CACHEGROUP_ID="$(curl -s -k -X GET -H "Cookie: mojolicious=$TMP_TO_COOKIE" $TRAFFIC_OPS_URI/api/1.2/cachegroups.json | python -c 'import json,sys;obj=json.load(sys.stdin);match=[x["id"] for x in obj["response"] if x["name"]=="mid-east"]; print match[0]')"
-# echo "Got cachegroup ID: $TMP_CACHEGROUP_ID"
-#
-# TMP_SERVER_TYPE_ID="$(curl -s -k -X GET -H "Cookie: mojolicious=$TMP_TO_COOKIE" $TRAFFIC_OPS_URI/api/1.2/types.json | python -c 'import json,sys;obj=json.load(sys.stdin);match=[x["id"] for x in obj["response"] if x["name"]=="RIAK"]; print match[0]')"
-# echo "Got server type ID: $TMP_SERVER_TYPE_ID"
-#
-# TMP_SERVER_PROFILE_ID="$(curl -s -k -X GET -H "Cookie: mojolicious=$TMP_TO_COOKIE" $TRAFFIC_OPS_URI/api/1.2/profiles.json | python -c 'import json,sys;obj=json.load(sys.stdin);match=[x["id"] for x in obj["response"] if x["name"]=="RIAK_ALL"]; print match[0]')"
-# echo "Got server profile ID: $TMP_SERVER_PROFILE_ID"
-#
-# TMP_PHYS_LOCATION_ID="$(curl -s -k -X GET -H "Cookie: mojolicious=$TMP_TO_COOKIE" $TRAFFIC_OPS_URI/api/1.2/phys_locations.json | python -c 'import json,sys;obj=json.load(sys.stdin);match=[x["id"] for x in obj["response"] if x["name"]=="plocation-nyc-1"]; print match[0]')"
-# echo "Got phys location ID: $TMP_PHYS_LOCATION_ID"
-#
-# TMP_CDN_ID="$(curl -s -k -X GET -H "Cookie: mojolicious=$TMP_TO_COOKIE" $TRAFFIC_OPS_URI/api/1.2/cdns.json | python -c 'import json,sys;obj=json.load(sys.stdin);match=[x["id"] for x in obj["response"] if x["name"]=="cdn"]; print match[0]')"
-# echo "Got cdn ID: $TMP_CDN_ID"
-#
-# curl -v -k -X POST -H "Cookie: mojolicious=$TMP_TO_COOKIE" --data-urlencode "host_name=$HOSTNAME" --data-urlencode "domain_name=$TMP_DOMAIN" --data-urlencode "interface_name=eth0" --data-urlencode "ip_address=$TMP_IP" --data-urlencode "ip_netmask=255.255.0.0" --data-urlencode "ip_gateway=$TMP_GATEWAY" --data-urlencode "interface_mtu=9000" --data-urlencode "cdn=$TMP_CDN_ID" --data-urlencode "cachegroup=$TMP_CACHEGROUP_ID" --data-urlencode "phys_location=$TMP_PHYS_LOCATION_ID" --data-ur [...]
-#
-# fi
-#
-# TMP_SERVER_ID="$(curl -s -k -X GET -H "Cookie: mojolicious=$TMP_TO_COOKIE" $TRAFFIC_OPS_URI/api/1.2/servers.json | python -c 'import json,sys;obj=json.load(sys.stdin);match=[x["id"] for x in obj["response"] if x["hostName"]=="'"$HOSTNAME"'"]; print match[0]')"
-# echo "Got server ID: $TMP_SERVER_ID"
-#
-# curl -v -k -H "Content-Type: application/x-www-form-urlencoded" -H "Cookie: mojolicious=$TMP_TO_COOKIE" -X POST --data-urlencode "id=$TMP_SERVER_ID" --data-urlencode "status=ONLINE" $TRAFFIC_OPS_URI/server/updatestatus
-#
-# openssl req -newkey rsa:2048 -nodes -keyout /etc/riak/certs/server.key -x509 -days 365 -out /etc/riak/certs/server.crt -subj "/C=$CERT_COUNTRY/ST=$CERT_STATE/L=$CERT_CITY/O=$CERT_COMPANY"
-# cp /etc/riak/certs/server.crt /etc/riak/certs/ca-bundle.crt
-#
-# /etc/init.d/riak restart
-# riak-admin security enable
-# riak-admin security add-group admins
-# riak-admin security add-group keysusers
-# riak-admin security add-user admin password=$ADMIN_PASS groups=admins
-# riak-admin security add-user riakuser password=$USER_PASS groups=keysusers
-# riak-admin security add-source riakuser 0.0.0.0/0 password
-# riak-admin security add-source admin 0.0.0.0/0 password
-# riak-admin security grant riak_kv.list_buckets,riak_kv.list_keys,riak_kv.get,riak_kv.put,riak_kv.delete on any to admins
-# riak-admin security grant riak_kv.get,riak_kv.put,riak_kv.delete on default ssl to keysusers
-# riak-admin security grant riak_kv.get,riak_kv.put,riak_kv.delete on default dnssec to keysusers
-# riak-admin security grant riak_kv.get,riak_kv.put,riak_kv.delete on default url_sig_keys to keysusers
-#
-# echo "INITIALIZED=1" >> /etc/environment
-}
-
-source /etc/environment
-if [ -z "$INITIALIZED" ]; then init; fi
-start
-