Merge branch 'some-bug-fixes' into 'master'

Some bug fixes and things

A couple of useful bug fixes and commits.

See merge request !28
This commit is contained in:
Ciaran Gultnieks 2014-11-07 14:49:07 +00:00
commit 2e56f4ecbf
4 changed files with 43 additions and 14 deletions

View file

@ -40,6 +40,9 @@ def update_awsbucket(repo_section):
Requires AWS credentials set in config.py: awsaccesskeyid, awssecretkey
'''
logging.debug('Syncing "' + repo_section + '" to Amazon S3 bucket "'
+ config['awsbucket'] + '"')
import libcloud.security
libcloud.security.VERIFY_SSL_CERT = True
from libcloud.storage.types import Provider, ContainerDoesNotExistError
@ -143,7 +146,7 @@ def update_serverwebroot(serverwebroot, repo_section):
def _local_sync(fromdir, todir):
rsyncargs = ['rsync', '--recursive', '--links', '--times',
rsyncargs = ['rsync', '--recursive', '--links', '--times', '--perms',
'--one-file-system', '--delete', '--chmod=Da+rx,Fa-x,a+r,u+w']
# use stricter rsync checking on all files since people using offline mode
# are already prioritizing security above ease and speed