github/pelican
1
0
Fork 1
mirror of https://github.com/getpelican/pelican.git synced 2025-10-15 20:28:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Separate SSH user/host/path vars in tasks.py

Browse source 
Refs #2623
This commit is contained in:
Justin Mayer 2019-10-09 11:17:44 -07:00
commit f52f276f2e
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
pelican/tools/templates/tasks.py.jinja2
View file

@ -23,9 +23,10 @@ CONFIG = {
'deploy_path': SETTINGS['OUTPUT_PATH'], 'deploy_path': SETTINGS['OUTPUT_PATH'],
{% if ssh %} {% if ssh %}
# Remote server configuration # Remote server configuration
'production': '{{ssh_user}}@{{ssh_host}}', 'ssh_user': '{{ssh_user}}',
'production_port': {{ssh_port}}, 'ssh_host': '{{ssh_host}}',
'dest_path': '{{ssh_target_dir}}', 'ssh_port': '{{ssh_port}}',
'ssh_path': '{{ssh_target_dir}}',
{% endif %} {% endif %}
{% if cloudfiles %} {% if cloudfiles %}
# Rackspace Cloud Files configuration settings # Rackspace Cloud Files configuration settings
@ -131,8 +132,8 @@ def publish(c):
c.run('pelican -s {settings_publish}'.format(**CONFIG)) c.run('pelican -s {settings_publish}'.format(**CONFIG))
c.run( c.run(
'rsync --delete --exclude ".DS_Store" -pthrvz -c ' 'rsync --delete --exclude ".DS_Store" -pthrvz -c '
'-e "ssh -p {production_port}" ' '-e "ssh -p {ssh_port}" '
'{} {production}:{dest_path}'.format( '{} {ssh_user}@{ssh_host}:{ssh_path}'.format(
CONFIG['deploy_path'].rstrip('/') + '/', CONFIG['deploy_path'].rstrip('/') + '/',
**CONFIG)) **CONFIG))