Merge branch 'master' of ssh://git.ikiwiki.info
Joey Hess
commit
9244b47d00
|
|
@ -0,0 +1,5 @@
|
|||
I installed a new wiki on my local machine. When I click on edit, I get the following error:
|
||||
|
||||
`Error: cannot write to /home/user/myiki2/.ikiwiki/lockfile: Permission denied`
|
||||
|
||||
I checked the permissions of that file and assured that they are the same as in my other working ikiwiki, but it doesn't help. Any idea?
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
[[!comment format=mdwn
|
||||
username="https://launchpad.net/~tale"
|
||||
nickname="tale"
|
||||
subject="What are the permissions?"
|
||||
date="2011-12-28T19:35:25Z"
|
||||
content="""
|
||||
What exactly are the permissions for the lockfile and the directory it is in?
|
||||
|
||||
What user is the ikiwiki running as?
|
||||
"""]]
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
[[!comment format=mdwn
|
||||
username="https://www.google.com/accounts/o8/id?id=AItOawk_MMtLPS7osC5MjX00q2ATjvvXPWqm0ik"
|
||||
nickname="micheal"
|
||||
subject="comment 2"
|
||||
date="2011-12-28T23:06:06Z"
|
||||
content="""
|
||||
<code>
|
||||
stat -c '%A %a %U %G %n' myiki2 myiki1
|
||||
drwxr-xr-x 755 user user myiki2
|
||||
drwxr-xr-x 755 user user myiki1
|
||||
|
||||
stat -c '%A %a %U %G %n' myiki2/.ikiwiki myiki1/.ikiwiki
|
||||
drwxr-xr-x 755 user user myiki2/.ikiwiki
|
||||
drwxr-xr-x 755 user user myiki1/.ikiwiki
|
||||
|
||||
stat -c '%A %a %U %G %n' myiki2/.ikiwiki/lockfile myiki1/.ikiwiki/lockfile
|
||||
-rw-r--r-- 644 user user myiki2/.ikiwiki/lockfile
|
||||
-rw-r--r-- 644 user user myiki1/.ikiwiki/lockfile
|
||||
</code>
|
||||
|
||||
As you see, myiki2 has the same permissions as myiki1, but myiki1 works.
|
||||
|
||||
"""]]
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
[[!comment format=mdwn
|
||||
username="https://launchpad.net/~tale"
|
||||
nickname="tale"
|
||||
subject="Editing via browser works"
|
||||
date="2011-12-27T18:47:16Z"
|
||||
content="""
|
||||
I now set up virtual host in apache2 and fudged the ipnumber to correspond to hostnames the ikiwiki uses. I do not want to update DNS before I have checked the site works.
|
||||
|
||||
Now I can log in using OpenID and edit the wiki via browser. This time the web pages are updated and the changes I made appear in the wiki.
|
||||
|
||||
I cheched the gitorigin_branch setting was empty string even in 2009 when I got this wiki. I begin to suspect editing the wiki using a git checkout would not work even in the host the ikiwiki is currently running on, and maybe did not work in the host it was running on in 2009.
|
||||
|
||||
It looks to me like ikiwiki is working on this new host except git configuration is somehow messed up. It is possible I never did use git checkout on the old host.
|
||||
|
||||
"""]]
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
[[!comment format=mdwn
|
||||
username="https://launchpad.net/~tale"
|
||||
nickname="tale"
|
||||
subject="Checked old host, git messed up there, too"
|
||||
date="2011-12-27T18:59:38Z"
|
||||
content="""
|
||||
I did
|
||||
git clone src.git
|
||||
on the host ikiwiki is currently running on, and got an old version of the wiki, not the one that is diplayed on the web page.
|
||||
|
||||
So even there editing via browser works, but git checks out an old version and the changes I make do not get shown on the web page after git push.
|
||||
|
||||
This new host I set up is thus no worse, actually slighty better now because git clone at least gets me the sources the web pages are generated from.
|
||||
|
||||
How to figure out what is wrong with ikiwiki setup in the using git part?
|
||||
"""]]
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
[[!comment format=mdwn
|
||||
username="https://launchpad.net/~tale"
|
||||
nickname="tale"
|
||||
subject="branch = master, still no luck"
|
||||
date="2011-12-28T03:22:57Z"
|
||||
content="""
|
||||
I learned from docs setting gitorigin_branch to empty string disables git pushing and pulling. So guessing
|
||||
|
||||
gitorigin_branch => 'master',
|
||||
|
||||
seemed a good idea.
|
||||
|
||||
However, now ikiwiki -setup gives:
|
||||
|
||||
taleman@porixi:~$ ikiwiki -setup ikiwiki.setup
|
||||
successfully generated /var/www/ikiwiki/debian.fi/ikiwiki.cgi
|
||||
successfully generated /home/taleman/wiki/wiki.git/hooks/post-update
|
||||
fatal: 'master': unable to chdir or not a git archive
|
||||
fatal: The remote end hung up unexpectedly
|
||||
'git pull master' failed: at /usr/share/perl5/IkiWiki/Plugin/git.pm line 195.
|
||||
taleman@porixi:~$
|
||||
"""]]
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
[[!template id=plugin name=pagespec_alias author="[[Jon]]"]]
|
||||
[[!tag type/meta]]
|
||||
|
||||
The pagespec_alias plugin allows the administrator(s) of a wiki to define
|
||||
[[PageSpec]] aliases: short names for PageSpecs to ease re-use.
|
||||
|
||||
Within the setup file, the `pagespec_aliases` value is treated as a list
|
||||
of key/value pairs. The keys define alias names, the values the pagespecs
|
||||
to which they refer.
|
||||
|
||||
For example:
|
||||
|
||||
pagespec_aliases:
|
||||
image: "*.png or *.jpg or *.jpeg or *.gif or *.ico"
|
||||
helper: "*.css or *.js"
|
||||
boring: "image() or helper() or internal(*)"
|
||||
|
||||
With the above, you could use the pagespec aliases such as
|
||||
|
||||
\[[!map pages="!boring()"]]
|
||||
|
||||
To define a site map which excluded various page names which might be
|
||||
uninteresting to include in a site map.
|
||||
|
||||
|
||||
## Download
|
||||
|
||||
* <https://github.com/jmtd/ikiwiki/blob/pagespec-alias/IkiWiki/Plugin/pagespec_alias.pm>
|
||||
|
|
@ -161,3 +161,9 @@ definitions essentially.
|
|||
>>>>>>> No pity required — but whoops, yes, that was a bit of a mistake
|
||||
>>>>>>> ☺ I guess I'll have to split the current `preprocess` in half.
|
||||
>>>>>>> — [[Jon]]
|
||||
|
||||
>>>>>>>> I've been taking another look at this today, as I'm very keen to
|
||||
>>>>>>>> close various open loops of mine in IkiWiki to move on and do some
|
||||
>>>>>>>> other stuff. However, I'm not actually *using* this at the moment,
|
||||
>>>>>>>> so whilst I think it's a good idea, I can't really motivate myself
|
||||
>>>>>>>> to fix it anymore. I guess for now, this should just rot. — [[Jon]]
|
||||
|
|
|
|||
|
|
@ -100,6 +100,10 @@ however, to add ' or internal()' to `boring`, for some reason.
|
|||
>>>> for this patch. I personally like special pages like Kathryn is doing
|
||||
>>>> more than complex setup files. --[[Joey]]
|
||||
|
||||
>>>>> I've ran out of time to keep working on this, so I'm just going to
|
||||
>>>>> submit it as a 'contrib' plugin and leave things at that for now.
|
||||
>>>>> — [[Jon]]
|
||||
|
||||
---------------------------
|
||||
|
||||
Based on the above, I have written an experimental plugin called "subset".
|
||||
|
|
@ -162,3 +166,4 @@ Unfortunately I haven't figured out how to do the dependencies - I'd really appr
|
|||
>>>>> I'm a bit confused by your statement "having the aliases/subsets/"things" work in any pagespec (inside map, or inline) is a deal-breaker for me".
|
||||
>>>>> Do you mean that you want them to work in any pagespec, or that you *don't* want them to work in any pagespec? -- [[KathrynAndersen]]
|
||||
|
||||
>>>>>> I mean I would want them to work in any pagespec. — [[Jon]]
|
||||
|
|
|
|||
Loading…
Reference in New Issue