Skip to content
This repository has been archived by the owner on Sep 29, 2023. It is now read-only.

Commit

Permalink
v1.0.8 release
Browse files Browse the repository at this point in the history
  • Loading branch information
copelco committed Oct 26, 2020
2 parents 0b6b59a + 31028d6 commit bb06c57
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 11 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ fabulaws.egg-info/
*~
docs/_build/
.tox
.python-version
.vscode
12 changes: 11 additions & 1 deletion docs/releases.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,17 @@
Release History
===============

* v1.0.5, August 27, 2020
* v1.0.8, October 26, 2020

* Fix bug where users with periods in their usernames were ignored
* Pass ``--yes`` to ``gpg`` to auto-confirm removal of private key from key ring during dbrestore process
* Set ``autostart=true`` for celerybeat and celerycam supervisor processes on worker

* v1.0.7, August 27, 2020

* Fix bug introduced in 1.0.6 with pre/post tasks running on more hosts than intended

* v1.0.6, August 27, 2020

* Add hooks to fix pre/post commands for ``bootstrap``, ``reload_production_db``,
and ``install_rsyslog``
Expand Down
2 changes: 1 addition & 1 deletion fabulaws/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "1.0.6"
__version__ = "1.0.8"
10 changes: 5 additions & 5 deletions fabulaws/library/wsgiautoscale/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -1087,7 +1087,7 @@ def bootstrap(purge=False):
# Run a "post_bootstrap" task, if it's defined.
available_commands = list_commands("", "short")
if "post_bootstrap" in available_commands:
executel("post_bootstrap")
executel("post_bootstrap", hosts=[env.host])


# CODE DEPLOYMENT
Expand Down Expand Up @@ -1215,7 +1215,7 @@ def dbrestore(filepath):
put(private_key, dest)
with settings(warn_only=True):
sudo(
'gpg --homedir {0} --batch --delete-secret-keys "{1}"'.format(
'gpg --homedir {0} --batch --yes --delete-secret-keys "{1}"'.format(
env.gpg_dir, env.backup_key_fingerprint
),
user=env.webserver_user,
Expand Down Expand Up @@ -1248,7 +1248,7 @@ def dbrestore(filepath):
finally:
with settings(warn_only=True):
sudo(
'gpg --homedir {0} --batch --delete-secret-keys "{1}"'.format(
'gpg --homedir {0} --batch --yes --delete-secret-keys "{1}"'.format(
env.gpg_dir, env.backup_key_fingerprint
),
user=env.webserver_user,
Expand Down Expand Up @@ -1472,7 +1472,7 @@ def reload_production_db(prod_env=env.default_deployment, src_env="production"):
# Run a "post_reload_production_db" task, if it's defined.
available_commands = list_commands("", "short")
if "post_reload_production_db" in available_commands:
executel("post_reload_production_db")
executel("post_reload_production_db", hosts=[env.host])


@task
Expand Down Expand Up @@ -1959,7 +1959,7 @@ def install_rsyslog():
# Run a "pre_install_rsyslog" task, if it's defined.
available_commands = list_commands("", "short")
if "pre_install_rsyslog" in available_commands:
executel("pre_install_rsyslog")
executel("pre_install_rsyslog", hosts=[env.host])

require("environment", provided_by=env.environments)
context = dict(env)
Expand Down
4 changes: 2 additions & 2 deletions fabulaws/library/wsgiautoscale/servers.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ def _get_users(self):
users = [
(n, os.path.join(users_dir, n))
for n in os.listdir(users_dir)
if "." not in n
] # skip files ending in '.gecos' or other suffixes
if not n.endswith(".gecos")
] # skip files ending in '.gecos'
return users

def _add_swap(self, path):
Expand Down
4 changes: 2 additions & 2 deletions fabulaws/library/wsgiautoscale/templates/supervisor.conf
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ command={{ virtualenv_root }}/bin/celery beat --app={{ celery_application }} --s
directory={{ code_root }}
user={{ webserver_user }}
numprocs=1
autostart=false
autostart=true
autorestart=true
stdout_logfile={{ log_dir }}/celerybeat.log
redirect_stderr=true
Expand All @@ -58,7 +58,7 @@ command={{ virtualenv_root }}/bin/celery events --app={{ celery_application }} -
directory={{ code_root }}
user={{ webserver_user }}
numprocs=1
autostart=false
autostart=true
autorestart=true
stdout_logfile={{ log_dir }}/celerycam.log
redirect_stderr=true
Expand Down

0 comments on commit bb06c57

Please sign in to comment.