vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #2312 from coreos-inc/fix-certs-dir

Browse source 
Fix two small issues around extra_ca_certs
This commit is contained in:
josephschorr 2017-01-26 15:22:37 -05:00 committed by GitHub
commit 398793fed4
2 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
conf/init/certs_install.sh
View file

@ -9,9 +9,11 @@ fi
# Add extra trusted certificates (as a directory) # Add extra trusted certificates (as a directory)
if [ -d /conf/stack/extra_ca_certs ]; then if [ -d /conf/stack/extra_ca_certs ]; then
echo "Installing extra certificates found in /conf/stack/extra_ca_certs directory" if test $(ls -A "/conf/stack/extra_ca_certs"); then
cp /conf/stack/extra_ca_certs/* /usr/local/share/ca-certificates/ echo "Installing extra certificates found in /conf/stack/extra_ca_certs directory"
cat /conf/stack/extra_ca_certs/* >> /venv/lib/python2.7/site-packages/requests/cacert.pem cp /conf/stack/extra_ca_certs/* /usr/local/share/ca-certificates/
cat /conf/stack/extra_ca_certs/* >> /venv/lib/python2.7/site-packages/requests/cacert.pem
fi
fi fi
# Add extra trusted certificates (as a file) # Add extra trusted certificates (as a file)

22
util/config/provider/fileprovider.py
View file

@ -6,6 +6,16 @@ from util.config.provider.baseprovider import (BaseProvider, import_yaml, export
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
def _ensure_parent_dir(filepath):
""" Ensures that the parent directory of the given file path exists. """
try:
parentpath = os.path.abspath(os.path.join(filepath, os.pardir))
if not os.path.isdir(parentpath):
os.makedirs(parentpath)
except IOError as ioe:
raise CannotWriteConfigException(str(ioe))
class FileConfigProvider(BaseProvider): class FileConfigProvider(BaseProvider):
""" Implementation of the config provider that reads the data from the file system. """ """ Implementation of the config provider that reads the data from the file system. """
def __init__(self, config_volume, yaml_filename, py_filename): def __init__(self, config_volume, yaml_filename, py_filename):
@ -54,8 +64,13 @@ class FileConfigProvider(BaseProvider):
def write_volume_file(self, filename, contents): def write_volume_file(self, filename, contents):
filepath = os.path.join(self.config_volume, filename) filepath = os.path.join(self.config_volume, filename)
with open(filepath, mode='w') as f: _ensure_parent_dir(filepath)
f.write(contents)
try:
with open(filepath, mode='w') as f:
f.write(contents)
except IOError as ioe:
raise CannotWriteConfigException(str(ioe))
return filepath return filepath
@ -75,6 +90,9 @@ class FileConfigProvider(BaseProvider):
def save_volume_file(self, filename, flask_file): def save_volume_file(self, filename, flask_file):
filepath = os.path.join(self.config_volume, filename) filepath = os.path.join(self.config_volume, filename)
_ensure_parent_dir(filepath)
# Write the file.
try: try:
flask_file.save(filepath) flask_file.save(filepath)
except IOError as ioe: except IOError as ioe: