stacco 0.1.41 → 0.1.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: deb88c9205dbbc93197eef4eb6ecf5c5859ea035
-  data.tar.gz: 48de702e41ea6914608632e5998eaad09f47a463
+  metadata.gz: cd3b5122c2aa5006d200f91aa767249551c2ea69
+  data.tar.gz: 1112f20fcc29dca377521b4e446772e47564b927
 SHA512:
-  metadata.gz: c583d4f566ba37048a45fdd95b14b84113e0c6690d127273a8ad2c219d03ba65c3204426abda82cc82defcdd43991296615c5a9160eba8f699e490fb640c8772
-  data.tar.gz: 2c5f1211f751ec68c7b4e91b90a7d4123b99fe1efecac6a4a32a10e3bd058b9b50d5014445cefbfac6833b4c714b307b339242a2aae4f182e9334308275ebfc0
+  metadata.gz: fe3e44bba8cac2017127b2c226529a7d3fc956fb8c46e3a8d5dca3ee61b1a7903c8ca5b8fadf7bcf40a3252e2ce8dd2df70c8a0d9a8709b7a8b4eee2704e7b91
+  data.tar.gz: 00cd6ef2f19e2fe2d15a58b614b6968faaf1b0d89787a08fa5c1f063e0cfe9c0395f20b4cf43117d50078a0fd70edc3f64729a5c95f835191ee03b97cd541b15

data/.git/COMMIT_EDITMSG

@@ -1 +1 @@
-Separate db and static into -infra layers
+Use logspout container

data/.git/logs/HEAD

@@ -116,3 +116,5 @@ e0bb46327d0309abfc4270f1a08236ac553f6904 5113f1339b8e19c5ae354a0ab1d76108de880e2
 9db61be32a5bc8781e6ed642207020d18cd597d0 4ea5fcde29a07173d22bd2e4fcb52399906b4845 Levi Aul <levi@leviaul.com> 1404361909 -0700	commit: Pull containers once during instance startup
 4ea5fcde29a07173d22bd2e4fcb52399906b4845 3a4a573849d1b145115744fba2de5cd0e5ea6ef8 Levi Aul <levi@leviaul.com> 1404429135 -0700	commit: Reconfigure hostname of BastionBox to match OpenVPN-AS's expectations
 3a4a573849d1b145115744fba2de5cd0e5ea6ef8 4cb8630f29c459e7723670b4b882c56623c77792 Levi Aul <levi@leviaul.com> 1404843521 -0700	commit: Separate db and static into -infra layers
+4cb8630f29c459e7723670b4b882c56623c77792 3de9d2e3f35a568a3d1eee4fdb25c0e840582d04 Levi Aul <levi@leviaul.com> 1404847588 -0700	commit: Switch from LogEntries to Papertrail
+3de9d2e3f35a568a3d1eee4fdb25c0e840582d04 40e9eeda4759c16e719178dc07e095f575184718 Levi Aul <levi@leviaul.com> 1404849539 -0700	commit: Use logspout container

data/.git/logs/refs/heads/master

@@ -58,3 +58,5 @@ a8daedf0736425657be336e720dd7520abe75f3d 89a9c546a2bc92ff3842edf6b5da4ee4b9bd229
 9db61be32a5bc8781e6ed642207020d18cd597d0 4ea5fcde29a07173d22bd2e4fcb52399906b4845 Levi Aul <levi@leviaul.com> 1404361909 -0700	commit: Pull containers once during instance startup
 4ea5fcde29a07173d22bd2e4fcb52399906b4845 3a4a573849d1b145115744fba2de5cd0e5ea6ef8 Levi Aul <levi@leviaul.com> 1404429135 -0700	commit: Reconfigure hostname of BastionBox to match OpenVPN-AS's expectations
 3a4a573849d1b145115744fba2de5cd0e5ea6ef8 4cb8630f29c459e7723670b4b882c56623c77792 Levi Aul <levi@leviaul.com> 1404843521 -0700	commit: Separate db and static into -infra layers
+4cb8630f29c459e7723670b4b882c56623c77792 3de9d2e3f35a568a3d1eee4fdb25c0e840582d04 Levi Aul <levi@leviaul.com> 1404847588 -0700	commit: Switch from LogEntries to Papertrail
+3de9d2e3f35a568a3d1eee4fdb25c0e840582d04 40e9eeda4759c16e719178dc07e095f575184718 Levi Aul <levi@leviaul.com> 1404849539 -0700	commit: Use logspout container

data/.git/logs/refs/remotes/origin/master

@@ -42,3 +42,4 @@ a8daedf0736425657be336e720dd7520abe75f3d 89a9c546a2bc92ff3842edf6b5da4ee4b9bd229
 9db61be32a5bc8781e6ed642207020d18cd597d0 4ea5fcde29a07173d22bd2e4fcb52399906b4845 Levi Aul <levi@leviaul.com> 1404361912 -0700	update by push
 4ea5fcde29a07173d22bd2e4fcb52399906b4845 3a4a573849d1b145115744fba2de5cd0e5ea6ef8 Levi Aul <levi@leviaul.com> 1404429142 -0700	update by push
 3a4a573849d1b145115744fba2de5cd0e5ea6ef8 4cb8630f29c459e7723670b4b882c56623c77792 Levi Aul <levi@leviaul.com> 1404843526 -0700	update by push
+4cb8630f29c459e7723670b4b882c56623c77792 40e9eeda4759c16e719178dc07e095f575184718 Levi Aul <levi@leviaul.com> 1404849544 -0700	update by push

data/.git/refs/heads/master

@@ -1 +1 @@
-4cb8630f29c459e7723670b4b882c56623c77792
+40e9eeda4759c16e719178dc07e095f575184718

data/.git/refs/remotes/origin/master

@@ -1 +1 @@
-4cb8630f29c459e7723670b4b882c56623c77792
+40e9eeda4759c16e719178dc07e095f575184718

data/.git/refs/tags/0.1.42

@@ -0,0 +1 @@
+40e9eeda4759c16e719178dc07e095f575184718

data/priv/roles/Backend.sh

@@ -48,6 +48,8 @@ docker-utils bootstrap
 docker pull tianon/true:latest
 docker pull bexio/base:latest
 
+docker pull progrium/logspout:latest
+
 docker pull bexio/amb:latest
 docker pull bexio/bitcoind:latest
 docker pull bexio/postgresql:latest
@@ -55,6 +57,12 @@ docker pull bexio/bexng:latest
 docker pull bexio/bexng-frontend:latest
 
 
+docker-utils define-service "progrium/logspout" \
+  --cmd-arg "syslog://${PAPERTRAIL_HOST}" \
+  --hostname="frontend.${DOMAIN}" \
+  --volume="/var/run/docker.sock:/tmp/docker.sock"
+
+
 if [ "${WALLET_NETWORK}" = "testnet3" ]; then
   docker run --name='bitcoind-data' --volumes-from='tbtc-data' tianon/true:latest
 else
@@ -79,7 +87,9 @@ docker-utils define-service "bexio/bexng-frontend" \
   --dependency "bexng" \
   --publish="80:8080"
 
+
 echo "starting docker-container services..."
+start logspout
 start bitcoind
 start postgresql
 start bexng

data/priv/roles/BaseImageGenerator.sh

@@ -11,10 +11,6 @@ cd "$HOME"
 echo "enabling mirroring for security apt sources"
 sed -i "s/security\.ubuntu\.com/${AWS_REGION}.ec2.archive.ubuntu.com/g" /etc/apt/sources.list
 
-echo "adding vendor apt sources"
-apt-key adv --keyserver 'hkp://pgp.mit.edu:80' --recv-keys 'C43C79AD'
-echo "deb http://rep.logentries.com/ trusty main" > /etc/apt/sources.list.d/logentries.list
-
 echo "installing packages"
 afg() {
   DEBIAN_FRONTEND=noninteractive \
@@ -26,7 +22,7 @@ afg() {
 afg clean
 afg update
 afg dist-upgrade
-afg install htop tree btrfs-tools xz-utils logentries kexec-tools debconf-utils
+afg install htop tree btrfs-tools xz-utils kexec-tools debconf-utils rsyslog-gnutls
 afg install python-setuptools python-pip python-setproctitle bundler ruby-nokogiri
 afg clean
 
@@ -39,9 +35,6 @@ EOF
 pip install -q awscli
 gem install -q --no-rdoc --no-ri aws-sdk docker-utils
 
-touch /etc/default/logentries_not_to_be_run
-apt-get install -qy logentries-daemon 2>/dev/null || :
-
 echo "installing aws cfn-tools"
 easy_install "https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-latest.tar.gz"
 
@@ -50,6 +43,8 @@ docker-utils bootstrap
 docker pull tianon/true:latest
 docker pull bexio/base:latest
 
+docker pull progrium/logspout:latest
+
 docker pull bexio/amb:latest
 docker pull bexio/bitcoind:latest
 docker pull bexio/postgresql:latest

data/priv/roles/Common.sh

@@ -21,25 +21,16 @@ cat >>/etc/hosts <<EOF
 EOF
 
 
-if [ -n "$LOGENTRIES_ACCOUNT_KEY" ]; then
-  le clean
-  rm -f /etc/default/logentries_not_to_be_run
-
-  echo "starting remote logging"
-  host_key=$(docker-utils get-host-uuid "${AWS_INSTANCE_LOGICAL_NAME}.${AWS_STACK_NAME}")
-
-  le init --account-key="${LOGENTRIES_ACCOUNT_KEY}" --agent-key="${host_key}"
-  le register --force --name="${host_title}" --hostname="${private_hostname}"
-  service logentries start
-
-  logs_to_follow=(syslog messages dmesg auth.log boot.log daemon.log dpkg.log kern.log cron secure faillog cloud-init-output.log)
-  for log_name in "${logs_to_follow[@]}"; do
-    log_path="/var/log/${log_name}"
-    if [ -f "${log_path}" ]; then
-      log_name=$(basename "${log_path}" '.log')
-      le follow --name="${log_name}" "${log_path}"
-    fi
-  done
-
-  service logentries restart
+if [ -n "$PAPERTRAIL_HOST" ]; then
+curl -sL "https://papertrailapp.com/tools/papertrail-bundle.pem" > /etc/ssl/certs/papertrail.pem
+cat >>/etc/rsyslog.d/99-papertrail.conf <<EOF
+\$PreserveFQDN on
+\$DefaultNetstreamDriverCAFile /etc/ssl/certs/papertrail.pem
+\$ActionSendStreamDriver gtls
+\$ActionSendStreamDriverMode 1
+\$ActionSendStreamDriverAuthMode x509/name
+\$ActionSendStreamDriverPermittedPeer *.papertrailapp.com
+*.*          @@${PAPERTRAIL_HOST}
+EOF
+restart rsyslog
 fi

data/priv/roles/Frontend.sh

@@ -7,10 +7,18 @@ docker pull bexio/base:latest
 docker pull bexio/amb:latest
 docker pull bexio/bexng-frontend:latest
 
+docker pull progrium/logspout:latest
+
+docker-utils define-service "progrium/logspout" \
+  --cmd-arg "syslog://${PAPERTRAIL_HOST}" \
+  --hostname="frontend.${DOMAIN}" \
+  --volume="/var/run/docker.sock:/tmp/docker.sock"
+
 docker-utils define-service "bexio/bexng-frontend" \
   -e "BEXNG_PORT_51607_TCP=tcp://${BEXNG_ADMIN_API_HOST}:51607" \
   --publish="80:8080"
 
 
 echo "starting docker-container services..."
+start logspout
 start bexng-frontend

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stacco
 version: !ruby/object:Gem::Version
-  version: 0.1.41
+  version: 0.1.42
 platform: ruby
 authors:
 - Levi Aul
@@ -101,6 +101,7 @@ files:
 - "./.git/objects/04/ba3537d34f705ab9056d4c516fb14df6784be0"
 - "./.git/objects/05/2ac756b2a13ad8a3aa101b73938b9fac6b825b"
 - "./.git/objects/05/2c54e01a85abffe364861cb65ae298b3153cb0"
+- "./.git/objects/05/5dcc62d5e9c0678cf9ec9a794a726bcde86f79"
 - "./.git/objects/05/aa1b23a9a9c8338064b367056458a3e6359872"
 - "./.git/objects/05/f886db46171205b6825bab13d09d4a84eac924"
 - "./.git/objects/06/30fdef20b3c925dff6aaac0eaadc748461ddd3"
@@ -133,6 +134,7 @@ files:
 - "./.git/objects/12/3f8240f031492c3d592ef7df560858ac44f927"
 - "./.git/objects/13/3988de1e75af1fd4ba23d63880fc4e73032928"
 - "./.git/objects/13/d67231e1644741c6985e8195f9318f670d0bba"
+- "./.git/objects/14/37c1ee362598cbb9a427d3b2a2a4fa279e2da3"
 - "./.git/objects/14/9a0f57bfaac4b4bc718fbee6f81fe62de84b82"
 - "./.git/objects/14/a2be36d9d9eb7a5837101019d683be904da1a0"
 - "./.git/objects/14/cd3cd91710915bb463f4148a181422ee0f95d7"
@@ -157,6 +159,7 @@ files:
 - "./.git/objects/1d/07fa71f37ca748d7999aa247156d7e65e6c170"
 - "./.git/objects/1d/164cb759be800934f9933add81b4b8b674b4c4"
 - "./.git/objects/1d/24fb1b18e61fee0a5e5a065984b959eb3e26f7"
+- "./.git/objects/1d/8578ba4f4e0d92075c37471326f211414be65d"
 - "./.git/objects/1d/f6d2aba16d8a2e603f26b9f47e7e513a1e63e9"
 - "./.git/objects/1d/f93d4a34d891a00b6b11d13e8e9c49e2e918d7"
 - "./.git/objects/1e/267701dc736da31cc52b18f5320bc8af164e0b"
@@ -226,12 +229,15 @@ files:
 - "./.git/objects/3a/b5a55065d39bc602c138b7f5ab70be55ae7a78"
 - "./.git/objects/3c/68dc78e11550ccb3f56205fe334aea1c9eecf9"
 - "./.git/objects/3c/a160491652dbac4b486a67368c3d5571a02ee7"
+- "./.git/objects/3d/e9d2e3f35a568a3d1eee4fdb25c0e840582d04"
 - "./.git/objects/3d/f99825f6039015db4c43abf789d2f1e54649f4"
 - "./.git/objects/3e/b5d827d4ac858c3fee5f1d5e4486304e211875"
 - "./.git/objects/3f/3c9515a56aa934068b1eb5846a6ca48a9e6b55"
 - "./.git/objects/40/0d47b25c38ad7561049aaafd806b7409e452ce"
 - "./.git/objects/40/1ec5566a108682e6735a166b503f6488fd7fa0"
 - "./.git/objects/40/e27dd83949a5a91228d4fb4562d3dd0899cf6c"
+- "./.git/objects/40/e9eeda4759c16e719178dc07e095f575184718"
+- "./.git/objects/41/5bb1dd9f108067e03a43661c36d6e15a1daedf"
 - "./.git/objects/41/ddc7cf35ba287bb797e05f87c10b2c9d95c32c"
 - "./.git/objects/42/5f5d060ee54ae4cc5f17572bc987f716cd17c1"
 - "./.git/objects/42/a30010d7fb35e5946ac0858140f8286748a49a"
@@ -284,6 +290,7 @@ files:
 - "./.git/objects/54/f0feff7b49b9909efb6ae80f646a91cd2f2ecc"
 - "./.git/objects/55/5abaf0d0b29f123811187b275b2c147a128cc1"
 - "./.git/objects/55/f2a4f9a642b2c9f19da6fcbfad18a22f4b11db"
+- "./.git/objects/56/172d70138104c4907e8a15154fde5b7cdd0cb9"
 - "./.git/objects/56/a1aa11820e45dae9cb6b3f3540abced735b644"
 - "./.git/objects/57/290bb57831f06c2bcbcd595e41b697cb9fdda0"
 - "./.git/objects/57/298313d53034ca639585d7250d687822609b7c"
@@ -389,6 +396,7 @@ files:
 - "./.git/objects/86/6d02d3443fbe28a0d5e0921ee2b62b182f6f04"
 - "./.git/objects/86/a06a4d1338d52898428e1c9319d9c5e8aa59fa"
 - "./.git/objects/87/3e0922c1acb90101e87d326a0169ebaabdd33c"
+- "./.git/objects/88/ef31b93fdce6c711c07151db663ba7df110d33"
 - "./.git/objects/89/71bc2a201ae9e2e5e048f9b525f22b6c2b4f65"
 - "./.git/objects/89/a9c546a2bc92ff3842edf6b5da4ee4b9bd2291"
 - "./.git/objects/8a/3812be98a369fe0e8cccc55a62f07d17a91564"
@@ -403,6 +411,7 @@ files:
 - "./.git/objects/8f/1a1c899b95fb0ed7c64a9eb6409531b3306f0b"
 - "./.git/objects/8f/602ddf7b210259e132a3ade20eb0d3ee0022c2"
 - "./.git/objects/90/79aee2c1d5b0f9f57cb47dbb305f70911fc48e"
+- "./.git/objects/90/8c4fbe2d8e8c1df6b43aac2ffe247f7972b1e6"
 - "./.git/objects/91/0702e82cd8e22e284d5b4d0634619f86b89d34"
 - "./.git/objects/91/0b28a5569b11c81e3caf3261bccc8f04d2aec1"
 - "./.git/objects/91/0f54ddc6ecf5df8e3389e1fedf4f91accf6086"
@@ -474,6 +483,7 @@ files:
 - "./.git/objects/b0/2c21c5b3c67f079eab9852d0718e6151fb1f16"
 - "./.git/objects/b0/8e071aa962e5ebe2312ced25ea2a0481a83fe7"
 - "./.git/objects/b0/fe19f390b13fe911e43a75ee2824056ab3a0e9"
+- "./.git/objects/b1/f4d1c6c0c686271aeb06eca2a4af8c48feffba"
 - "./.git/objects/b2/44f04793eab9981e6218545864ac54badabb94"
 - "./.git/objects/b2/5ec852d2d32e554d177c9ea8d5ce97b2282e31"
 - "./.git/objects/b2/676999f6387ba826fc4bdcca05a96efadc6448"
@@ -502,6 +512,7 @@ files:
 - "./.git/objects/b8/9ad662129a008f33d5ea1f491d66c4cd3fadf9"
 - "./.git/objects/b8/cd9a56aeab69e861ec8b3449b0910cb9d41d6e"
 - "./.git/objects/b9/757f7b2d299015b25db06e187ed80887e83545"
+- "./.git/objects/b9/b851ac57bbd4b0b3f9e7ce7c0d597a3b6989fb"
 - "./.git/objects/bb/54ec1245246faecf2f28e400f64a76e8216010"
 - "./.git/objects/bb/b938a873e6d1a42776f30f8d93e5492ae838f5"
 - "./.git/objects/bc/69a77b34d39b908c534274b90e5cad82bdc754"
@@ -634,6 +645,7 @@ files:
 - "./.git/objects/eb/a94c9c2550245bf975a869e6f231a6f40f594a"
 - "./.git/objects/eb/db05ffaf2390f3e79b9eefc7904c803f675515"
 - "./.git/objects/ec/167eaf4249854bd628efe76ba305f841e66845"
+- "./.git/objects/ec/810d354b7ff26e59bb7e45a5ee190af8784dc9"
 - "./.git/objects/ec/db4c8cd1c16ecaaff88132e743f6565c262b51"
 - "./.git/objects/ed/3b548d4b4e5724fe30759e8cd01d2fac1e2ad1"
 - "./.git/objects/ed/6c513d211c722d48e7aa4db71c79c32e031560"
@@ -671,6 +683,7 @@ files:
 - "./.git/objects/f9/cfdf290b3d42c9045a835224625f1f09dd53cd"
 - "./.git/objects/fa/eaed7258ec3d6de19bdeb06711790ea910c9e0"
 - "./.git/objects/fb/ddab071998a1a7f53b3a34ceff1c91be4bc4f7"
+- "./.git/objects/fd/1bcb02377cd85faae62a90cd1626a69eb505c3"
 - "./.git/objects/fd/3866df006d4c81819853791ab3df89f784a07a"
 - "./.git/objects/fd/995c5e9c0de964c620f76e0dc8b2863c23248b"
 - "./.git/objects/fd/d5c353f7479afb33cfa69355caf659ee0a96c8"
@@ -716,6 +729,7 @@ files:
 - "./.git/refs/tags/0.1.39"
 - "./.git/refs/tags/0.1.40"
 - "./.git/refs/tags/0.1.41"
+- "./.git/refs/tags/0.1.42"
 - "./.gitignore"
 - "./Dockerfile"
 - "./README.md"