@@ -8,9 +8,7 @@ It comes with Rake and Capistrano tasks for deploying the application and syncin The +master+ branch is bare application, +restafari_org+ branch is what runs @ www.restafari.org. -When you forks, you *should make your own branch* for your own styling, so you can <tt>git pull</tt> any future updates from the master and then merge/cherry-pick them into your branch. - -It is currently alpha software. +(In case you like to use Marley, you should fork it and then *make your own branch* for your own styling, so you can <tt>git pull</tt> any future updates from the master and then merge/cherry-pick them into your branch. == Ingredients @@ -63,15 +61,17 @@ There are several ways how to do that: * You can be less glorious, of course, and save your articles to some folder on your disk and <tt>scp</tt>-ing said folder to the server. Or use SFTP? Cyberduck drag & drop? Aaargh, not reccommended unless you _really_ like to see what you're doing, in real time. -* You can implement some sane practice and start versioning your writing with Git. (What else?) This way, you can setup remote repository on your server, just <tt>push</tt>-ing changes whenever you feel like you want to say something in public. A <i>post-commit hook</i> is completely neccessary in this case, of course. (It isn't paramount of convenience having to SSH on your server to run <tt>git pull origin master</tt> in some folder.) You can use Capistrano task <tt>cap sync:setup:hook</tt> for setting this up! +* You can implement some sane practice and start versioning your writing with Git. (What else?) This way, you can setup remote repository on your server, just <tt>push</tt>-ing changes whenever you feel like you want to say something in public. A <i>post-commit hook</i> is completely neccessary in this case, of course. (It isn't paramount of convenience having to SSH on your server to run <tt>git pull origin master</tt> in some folder.) See Capistrano task <tt>cap sync:setup:hook</tt> for setting this up. + +* When you already use Git, you can push to Github (where else?), and have Github call Marley by it's Post-Receive Hooks (http://github.com/guides/post-receive-hooks). Github then calls Marley's <tt>/sync</tt> and it will <tt>git pull</tt> changes from Github. How is this authenticated? Good question. By setting up a (possibly long and secure) token in the config file. OMG! Could be overheard in the internets! If you're worried or prudent, do not use this. (See Capistrano task <tt>cap sync:setup:github</tt> for adding remote Github repo on the server!) -* When you already use Git, you can push to Github (where else?), and have Github call Marley by it's Post-Receive Hooks (http://github.com/guides/post-receive-hooks). Github then calls Marley's <tt>/sync</tt> and it will <tt>git pull</tt> changes from Github. How is this authenticated? Good question. By setting up a (possibly long and secure) token in the config file. OMG! Could be overheard in the internets! If you're worried or prudent, do not use this. (Use Capistrano task <tt>cap sync:setup:github</tt> for adding remote Github repo on the server!) +You can set-up last two options by running Capistrano task <tt>cap sync:setup</tt>. Choose whether you like to upload your local data as a Git repository to the server (and setup post-receive hook in doing so) or you want to clone data from Github repository. You should add a Post-Receive URL in your repo's administration on Github as told by the task when it has runned. Of course, put other ideas in the Marley Wiki (http://github.com/karmi/marley/wikis) == Todo -* Implement data syncing logic (git push to remote with post-receive hook, Github post-commit hook to Marley, etc) +* Solve anti-spam failing issues * Add minimal admin interface feature for filtering spam comments (based on HTTP-Auth) * Do not show spam comments in HTML and feed (after ^^^) * Enable commenters edit their comments for 15 minutes after posting (based on cookie) README.rdoc de5373eae68a73b92a5397fea9e7c8a75ad74b6c Karel Minarik karmi@karmi.cz http://github.com/lukeredpath/marley/commit/08bedf842eeb39572b12680b89b564675ad0734e 08bedf842eeb39572b12680b89b564675ad0734e 2008-11-09T04:05:00-08:00 2008-11-09T04:05:00-08:00 Clarified README 50f95520a62f962c48bfbc0e3e03d6638885448e Karel Minarik karmi@karmi.cz