Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
config.yml
__pycache__/
*.pyc
s3pd.egg-info/
build/
dist/
Empty file added s3pd/__init__.py
Empty file.
File renamed without changes.
6 changes: 3 additions & 3 deletions pull-deploy.py → s3pd/pull_deploy.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import yaml
import argparse

import load_config
from .load_config import get_config

# These seem fair to set as globals; they could be put into the config file
# as new options with a default override for backwards compatibility
Expand Down Expand Up @@ -260,7 +260,7 @@ def send_sns_log(message, arn):


def pull(cfg_file):
cfg = load_config.get_config(cfg_file)
cfg = get_config(cfg_file)

response = requests.get('http://169.254.169.254/latest/meta-data/instance-id')
instance_id = response.text
Expand All @@ -285,7 +285,7 @@ def pull(cfg_file):

def show(cfg_file):
log("Showing config from path: "+cfg_file)
cfg = load_config.get_config(cfg_file)
cfg = get_config(cfg_file)

print(cfg)

Expand Down
6 changes: 3 additions & 3 deletions push-deploy.py → s3pd/push_deploy.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import sys
import argparse

import load_config
from .load_config import get_config

def log(msg):
now = datetime.datetime.now()
Expand All @@ -20,7 +20,7 @@ def log(msg):


def deploy(deploy, cfg_file):
cfg = load_config.get_config(cfg_file)
cfg = get_config(cfg_file)

date_string = datetime.datetime.today().strftime("%Y-%m-%d_%H-%M-%S")
timestamp = int(time.time())
Expand All @@ -45,7 +45,7 @@ def deploy(deploy, cfg_file):

def show(cfg_file):
log("Showing config from path: "+cfg_file)
cfg = load_config.get_config(cfg_file)
cfg = get_config(cfg_file)

print(cfg)

Expand Down
29 changes: 29 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import os
from setuptools import setup, find_packages


def read(fname):
return open(os.path.join(os.path.dirname(__file__), fname)).read()

setup(
name="s3pd",
version="0.1.0",
author="Mike Lehan",
description="Tool to syncronise deployments from S3 onto multiple EC2 instances",
license="MIT",
keywords=[],
url="",
packages=find_packages(),
requires=[
'boto3',
'requests',
'PyYAML',
],
long_description=read('README.md'),
entry_points={
'console_scripts': [
'pull-deploy = as3pd.pull_deploy:main',
'push-deploy = as3pd.push_deploy:main',
]
},
)