Closed yarikoptic closed 7 years ago
@yarikoptic The root
is a placeholder. No one is actually connecting as that.
The Makefile was updated this afternoon to no longer require that the SSH_USER param be set. Please pull and it will work just fine.
---Alex
Or rather, since datalad has a culture of leaving issues open: reopening
@yarikoptic Please close this when you ack that you've opened a non-issue
---Alex
meanwhile I have manually scped _files to new server.
I still see only old version:
$> git remote show origin
* remote origin
Fetch URL: git://github.com/datalad/datalad.org.git
Push URL: git@github.com:datalad/datalad.org.git
HEAD branch: master
Remote branches:
master tracked
old tracked
Local branches configured for 'git pull':
master merges with remote master
old merges with remote old
Local refs configured for 'git push':
master pushes to master (fast-forwardable)
old pushes to old (up to date)
changes on filesystem:
Makefile | 4 ++--
pelican-plugins | 0
2 11460.....................................:Fri 25 Aug 2017 01:50:56 PM EDT:.
(git)hopa:~datalad/datalad.org[master]git
$> git fetch origin
changes on filesystem:
Makefile | 4 ++--
pelican-plugins | 0
2 11461.....................................:Fri 25 Aug 2017 01:51:01 PM EDT:.
(git)hopa:~datalad/datalad.org[master]git
$> git show origin/master
commit dd71ac9003410682f1cf751d08f49a604a58000c (origin/master)
Author: Alex Waite <alex@waite.eu>
Date: Fri Aug 25 15:26:16 2017 +0200
New hosting server
diff --git a/Makefile b/Makefile
index bd5919d..1ec1451 100644
--- a/Makefile
+++ b/Makefile
@@ -8,10 +8,10 @@ OUTPUTDIR=$(BASEDIR)/output
CONFFILE=$(BASEDIR)/pelicanconf.py
PUBLISHCONF=$(BASEDIR)/publishconf.py
-SSH_HOST=falkor.datalad.org
+SSH_HOST=kumo.ovgu.de
SSH_PORT=22
SSH_USER=root
-SSH_TARGET_DIR=/srv/datalad.org/www/
+SSH_TARGET_DIR=/srv/datalad.org/
RSYNC_OPTS = -rzlhv --delete --copy-links --exclude=_files
@yarikoptic Hmm my bad. I could have sworn I pushed it. As in, certain enough that now I'm trying to think of what different repo I pushed...
In any case. Fix already done; it's just on my comp at work; and I'm currently doing what my soul desperately needs: alcohol and rest. I was not built for back-to-back 80 hour weeks.
I'll reply to any of your other issues, etc tomorrow.
---Alex
sorry -- I cannot push for you from your comp at work, thus assigning back
enjoy C₂H₅OH -- I will catch up with you on that in a few hours ;)
there was substantial refactoring of Makefile hardcoding settings which imho should be up to
~/.ssh/config
settings instead. Makefile should just know "whereto". The rest (specifics of the ssh access) should be within ~/.ssh/config since they might vary across ppl/networks/situations. Also I feel real unease with any automated action accessing critical servers asroot
-- was there a real demand for that? It is somewhat of a convention now that we have "free floating" _files on our projects' websites (to just host some supplemental materials outside of VCS/generation)... so they must not be removed and if hosting is moved, should move along.