Merge commit 'origin/master' into po
Joey Hess
commit
9dee7d1554
|
|
@ -10,3 +10,20 @@ Hi, there's no return_to from a designated OpenID server page, specs requires (I
|
|||
> * How can one reproduce the bug?
|
||||
>
|
||||
> PS, please file bugs under [[bugs]] in future. --[[Joey]]
|
||||
|
||||
>> Oops, my bad, didn't know that existed at the time I wrote this.
|
||||
>>
|
||||
>> What happened is that the process wouldn't complete, therefore I couldn't login with my OpenID.
|
||||
>>
|
||||
>> reproducibility: every time
|
||||
>>
|
||||
>> Should probably move this page, eh? ;)
|
||||
>> I'd do that, but I dunno know other than using the SCM backend in question....
|
||||
|
||||
Here's some actual output (with my OpenID URL stripped out):
|
||||
|
||||
do=postsignin&oic.time=1238224497-1450566d93097caa707f&openid.assoc_handle=%7BHMAC-SHA1%7D%7B49cdce76%7D%7BBhuXXw%3D%3D%7D&openid.identity=|<==== MY OPENID URL GOES HERE ====>|&openid.mode=id_res&openid.op_endpoint=http%3A%2F%2Fwww.myopenid.com%2Fserver&openid.response_nonce=2009-03-28T07%3A15%3A02ZDUFmG3&openid.return_to=http%3A%2F%2Fsimonraven.kisikew.org%2Fbin%2Fikiwiki.cgi%3Fdo%3Dpostsignin%26oic.time%3D1238224497-1450566d93097caa707f&openid.sig=E51Xh6Gnjku%2B0se57qCyhHbT5QY%3D&openid.signed=assoc_handle%2Cidentity%2Cmode%2Cop_endpoint%2Cresponse_nonce%2Creturn_to%2Csigned
|
||||
|
||||
The `return_to` arg should NOT be `signed`, it should be the originating URL where you initially logged in.
|
||||
|
||||
Also, I dunno what the assoc_handle is doing spitting out an arg like `{HMAC-SHA1}{49cdce76}{BhuXXw%3D%3D}` it should be processed further. I have the needed perl packages installed (latest for Lenny). Hrm, would endianness matter?
|
||||
|
|
|
|||
|
|
@ -335,9 +335,29 @@ daring a timid "please pull"... or rather, please review again :)
|
|||
> outside `po.pm`.
|
||||
>
|
||||
> * Is it worth trying to fix compatability with `indexpages`?
|
||||
>>
|
||||
>> Supporting `usedirs` being enabled or disabled was already quite
|
||||
>> hard IIRC, so supporting all four combinations of `usedirs` and
|
||||
>> `indexpages` settings will probably be painful. I propose we forget
|
||||
>> about it until someone reports he/she badly needs it, and then
|
||||
>> we'll see what can be done.
|
||||
>>
|
||||
> * Would it make sense to go ahead and modify `page.tmpl` to use
|
||||
> OTHERLANGUAGES and PERCENTTRANSLATED, instead of documenting how to modify it?
|
||||
>>
|
||||
>> Done in my branch.
|
||||
>>
|
||||
> * Would it be better to disable po support for pages that use unsupported
|
||||
> or poorly-supported markup languages?
|
||||
>
|
||||
>> I prefer keeping it enabled, as:
|
||||
>>
|
||||
>> * most wiki markups "almost work"
|
||||
>> * when someone needs one of these to be fully supported, it's not
|
||||
>> that hard to add dedicated support for it to po4a; if it were
|
||||
>> disabled, I fear the ones who could do this would maybe think
|
||||
>> it's blandly impossible and give up.
|
||||
>>
|
||||
> --[[Joey]]
|
||||
>>
|
||||
>> --[[intrigeri]]
|
||||
|
|
|
|||
|
|
@ -11,51 +11,48 @@ two copies of the website in git (source and the compiled site), and all
|
|||
historical versions too. So it could happen. If it does, you can pay github
|
||||
for more space, or you can migrate your site elsewhere.
|
||||
|
||||
## github setup
|
||||
## Github Setup
|
||||
|
||||
* Go to [github](http://github.com/) and sign up for an account, if you
|
||||
haven't already.
|
||||
* Be sure to add your laptop's ssh key to it so you can push
|
||||
to github.
|
||||
* Create a repository on githib named `$YOU.github.com`, substituting your
|
||||
username. This repository will be used to publish your compiled website.
|
||||
* Go to [github](http://github.com/) and sign up for an account, if you haven't already.
|
||||
* Be sure to add your laptop's ssh key to it so you can push to github.
|
||||
* Create a repository on github named `$YOU.github.com`, substituting your
|
||||
*username*. This repository will be used to publish your compiled website.
|
||||
* Create a repository on github named `$YOU` (or anything else you like).
|
||||
This repository will be used to publish the source of your website.
|
||||
This is actually optional.
|
||||
|
||||
## local setup
|
||||
## Local Setup
|
||||
|
||||
* On your laptop, create two empty git repositories to correspond to the
|
||||
github repositories:
|
||||
YOU=# your github username here
|
||||
mkdir ~/$YOU.github.com
|
||||
cd ~/$YOU.github.com
|
||||
git init
|
||||
git remote add origin git@github.com:$YOU/$YOU.github.com.git
|
||||
mkdir ~/$YOU
|
||||
cd ~/$YOU
|
||||
git init
|
||||
git remote add origin git@github.com:$YOU/$YOU.git
|
||||
* On your laptop, create two empty git repositories to correspond to the github repositories: <br />
|
||||
`YOU = your github username here` <br />
|
||||
`mkdir ~/$YOU.github.com` <br />
|
||||
`cd ~/$YOU.github.com` <br />
|
||||
`git init` <br />
|
||||
`git remote add origin git@github.com:$YOU/$YOU.github.com.git` <br />
|
||||
`mkdir ~/$YOU` <br />
|
||||
`cd ~/$YOU` <br />
|
||||
`git init` <br />
|
||||
`git remote add origin git@github.com:$YOU/$YOU.git` <br />
|
||||
* Add some wiki pages, such as an `index.mdwn`, to `~/$YOU`, and check them
|
||||
in and commit them to git. You need something to push to github. Run
|
||||
`git push origin master` to push the source pages to github.
|
||||
|
||||
## publishing to github
|
||||
## Publishing to Github
|
||||
|
||||
* Now build your wiki with a command such as:
|
||||
ikiwiki ~/$YOU ~/$YOU.github.com --refresh
|
||||
* Now build your wiki with a command such as: <br />
|
||||
`ikiwiki ~/$YOU ~/$YOU.github.com --refresh`
|
||||
* Each time you build the wiki you will need to commit the changes
|
||||
to git, and push the compiled pages to github:
|
||||
cd ~/YOU.github.com
|
||||
git add .
|
||||
git commit -a -m update
|
||||
git push origin master
|
||||
to git, and push the compiled pages to github: <br />
|
||||
`cd ~/YOU.github.com` <br />
|
||||
`git add .` <br />
|
||||
`git commit -a -m update` <br />
|
||||
`git push origin master` <br />
|
||||
|
||||
Your wiki will show up at `http://$YOU.github.com/` within ten
|
||||
minutes after the first push, and changes you push to it from then on
|
||||
should show up immediatly.
|
||||
should show up immediately.
|
||||
|
||||
## enhancements
|
||||
## Enhancements
|
||||
|
||||
You can follow the instructions in [[laptop_wiki_with_git]] to set up an
|
||||
editable version of your wiki on your laptop. Then you can use the web
|
||||
|
|
|
|||
|
|
@ -111,3 +111,5 @@ hashes is desired, it could return the full set of hashes.
|
|||
>>>> It looks good. I made some small changes to it in my own po branch.
|
||||
>>>> Nothing significant really. If this were not tied up in the po branch,
|
||||
>>>> I've have merged it to master already. --[[Joey]]
|
||||
|
||||
>>>> Thanks, this is great :) --[[intrigeri]]
|
||||
|
|
|
|||
Loading…
Reference in New Issue