some small changes and prepared everything for a ftp deploy

This commit is contained in:
Marvin Steadfast 2015-04-14 08:26:38 +02:00
parent fbfa870134
commit b408d63294
3 changed files with 8 additions and 8 deletions

View File

@ -8,8 +8,8 @@ OUTPUTDIR=$(BASEDIR)/output
CONFFILE=$(BASEDIR)/pelicanconf.py CONFFILE=$(BASEDIR)/pelicanconf.py
PUBLISHCONF=$(BASEDIR)/publishconf.py PUBLISHCONF=$(BASEDIR)/publishconf.py
FTP_HOST=localhost FTP_HOST=xsteadfastx.org/
FTP_USER=anonymous FTP_USER=xstead_0
FTP_TARGET_DIR=/ FTP_TARGET_DIR=/
SSH_HOST=localhost SSH_HOST=localhost
@ -95,7 +95,7 @@ dropbox_upload: publish
cp -r $(OUTPUTDIR)/* $(DROPBOX_DIR) cp -r $(OUTPUTDIR)/* $(DROPBOX_DIR)
ftp_upload: publish ftp_upload: publish
lftp ftp://$(FTP_USER)@$(FTP_HOST) -e "mirror -R $(OUTPUTDIR) $(FTP_TARGET_DIR) ; quit" lftp ftp://$(FTP_USER)@$(FTP_HOST) -e "set ftp:ssl-allow no; mirror -R $(OUTPUTDIR) $(FTP_TARGET_DIR) ; quit"
s3_upload: publish s3_upload: publish
s3cmd sync $(OUTPUTDIR)/ s3://$(S3_BUCKET) --acl-public --delete-removed --guess-mime-type s3cmd sync $(OUTPUTDIR)/ s3://$(S3_BUCKET) --acl-public --delete-removed --guess-mime-type

View File

@ -13,8 +13,8 @@ RELATIVE_URLS = True
GITHUB_URL = 'http://github.com/xsteadfastx/' GITHUB_URL = 'http://github.com/xsteadfastx/'
TWITTER_NAME = 'xsteadfastx' TWITTER_NAME = 'xsteadfastx'
#DISQUS_SITENAME = "xsteadfastxistryingtocode" DISQUS_SITENAME = "xsteadfastx"
ISSO_URL = 'http://comments.xsteadfastx.org' #ISSO_URL = 'http://comments.xsteadfastx.org'
PDF_GENERATOR = False PDF_GENERATOR = False
REVERSE_CATEGORY_ORDER = True REVERSE_CATEGORY_ORDER = True
LOCALE = "C" LOCALE = "C"
@ -57,8 +57,8 @@ THEME = 'themes/xsteadfastx-greg'
OUTPUT_PATH = 'output' OUTPUT_PATH = 'output'
PATH = 'content' PATH = 'content'
ARTICLE_URL = '{date:%Y}/{date:%m}/{slug}/' ARTICLE_URL = '{date:%Y}/{date:%m}/{date:%d}/{slug}/'
ARTICLE_SAVE_AS = '{date:%Y}/{date:%m}/{slug}/index.html' ARTICLE_SAVE_AS = '{date:%Y}/{date:%m}/{date:%d}/{slug}/index.html'
# plugins # plugins
PLUGIN_PATHS = ['pelican-plugins'] PLUGIN_PATHS = ['pelican-plugins']

View File

@ -39,7 +39,7 @@
<div id="disqus_thread"></div> <div id="disqus_thread"></div>
<script type="text/javascript"> <script type="text/javascript">
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */ /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
var disqus_shortname = 'gregreda'; // required: replace example with your forum shortname var disqus_shortname = '{{ DISQUS_SITENAME }}'; // required: replace example with your forum shortname
/* * * DON'T EDIT BELOW THIS LINE * * */ /* * * DON'T EDIT BELOW THIS LINE * * */
(function() { (function() {