Skip to content
This repository was archived by the owner on Jan 27, 2018. It is now read-only.

Allow custom HTDocs folder for PHP instances #36

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow custom HTDocs folder for PHP instances #36

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion letsencrypt_gandi/shs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ def add_parser_arguments(cls, add):
help="shs name.")
add("vhost", default='default',
help="vhost")
add("htdocs",
help="custom htdocs folder (only for PHP instances)")

def __init__(self, *args, **kwargs):
"""Initialize an SHS Configurator.
Expand Down Expand Up @@ -126,6 +128,7 @@ def prepare(self):
"name".format(self.option_name('name')))

self.vhost = self.conf('vhost')
self.htdocs = self.conf('htdocs')

def _api_key_from_gandi_cli(self):
"""Got cli? grab it https://cli.gandi.net
Expand Down Expand Up @@ -191,7 +194,9 @@ def _lookup_shs(self):
return paas['user'], paas['ftp_server']

def _base_path(self):
if re.match('^php', self.shs_info['type']):
if self.htdocs and re.match('^php', self.shs_info['type']):
return 'vhosts/{vhost}/{htdocs}/'.format(vhost=self.vhost, htdocs=self.htdocs)
elif re.match('^php', self.shs_info['type']):
return 'vhosts/{vhost}/htdocs/'.format(vhost=self.vhost)
elif re.match('^(python|nodejs)', self.shs_info['type']):
return 'vhosts/default'
Expand Down