|
|
Created:
13 years, 4 months ago by ambs Modified:
13 years, 1 month ago CC:
lilypond-devel_gnu.org Visibility:
Public. |
Descriptionchanges the way make website is called (if one copy the makefile there is no point in using the makefile from the git repository, or then, there is no point in copying -- or I missed something).
The solution is not texi based. Why not? because it is a patch to solve a problem that is not related with the new website, but with the old.
The idea is simple, just add an index.html file under /web/install/ that redirects to downloads.html.
The makefile code can be easily copied for other folders/pages that are hanging out there. I did not add them because I do not know if you like the solution.
If someone wants to test, it is easy: just backup the website, and give it a shot. It should not do any malicious thing.
You can also test it locally, but the redirect will not work, as I specified a absolute path.
Patch Set 1 #
Total comments: 3
MessagesTotal messages: 22
Sometimes I hate being right. I really wish that somebody had offered to mentor you -- the whole point of a mentor (i.e. somebody familiar with our development process) is to protect you against this kind of situation. 1) your solution will not work because the website is not built in the production area. A separate script copies the website, once it's built, into the web server directory. Your web/install.html will never be seen by the web server. 2) I would not accept this solution even if it worked, because it involves weird hard-coding for the old website. Look, issue 1272 is not hard to solve! Copying those pdfs will take maybe 30 minutes. Adding the redirect is probably 15 minutes if you've never done .htaccess files before and need to read apache's documentation from scratch. Just rescue the material we want to keep from /web/, set up a redirect for every /web/ url, then I'll remove that directory directly. http://codereview.appspot.com/5500069/diff/1/Documentation/contributor/websit... File Documentation/contributor/website-work.itexi (right): http://codereview.appspot.com/5500069/diff/1/Documentation/contributor/websit... Documentation/contributor/website-work.itexi:128: make -f website.make WEBSITE_ONLY_BUILD=1 \ This would break the website completely! There is no website.make in the lilypond/ directory on the server.
Sign in to reply to this message.
http://codereview.appspot.com/5500069/diff/1/Documentation/contributor/websit... File Documentation/contributor/website-work.itexi (right): http://codereview.appspot.com/5500069/diff/1/Documentation/contributor/websit... Documentation/contributor/website-work.itexi:128: make -f website.make WEBSITE_ONLY_BUILD=1 \ Note that this does not change any script, JUST documentation. If this documentation says you need to copy website.make, then website.make IS THERE. If you copy from this page every time you update your server, then at least remove the line 105 from the documentation, as that file is then not used.
Sign in to reply to this message.
http://codereview.appspot.com/5500069/diff/1/Documentation/contributor/websit... File Documentation/contributor/website-work.itexi (right): http://codereview.appspot.com/5500069/diff/1/Documentation/contributor/websit... Documentation/contributor/website-work.itexi:128: make -f website.make WEBSITE_ONLY_BUILD=1 \ On 2011/12/22 16:10:39, ambs wrote: > Note that this does not change any script, JUST documentation. If this > documentation says you need to copy website.make, then website.make IS THERE. No, line 105 copies website.make into $HOME/lilypond/trusted-scripts, not $HOME/lilypond/ However, using website.make from git is certainly a security risk, which I will fix immediately on the server. Thanks for catching this!
Sign in to reply to this message.
> 1) your solution will not work because the website is not built in the > production area. A separate script copies the website, once it's built, into > the web server directory. Your web/install.html will never be seen by the web > server. Because the script doesn't copy it. That would be easy to solve. > 2) I would not accept this solution even if it worked, because it involves weird > hard-coding for the old website. Agreed. But solves an issue that is hanging around for.. one year? I am not selling this as the salvation for the world, but as a patch to remove that page from newbies looking from lilypond while no lilypond devel has 30 minutes to copy the PDF files :) Anyway, will try to find what files are being pointed by the new website. Cheers
Sign in to reply to this message.
On 2011/12/22 16:16:44, Graham Percival wrote: > http://codereview.appspot.com/5500069/diff/1/Documentation/contributor/websit... > File Documentation/contributor/website-work.itexi (right): > > http://codereview.appspot.com/5500069/diff/1/Documentation/contributor/websit... > Documentation/contributor/website-work.itexi:128: make -f website.make > WEBSITE_ONLY_BUILD=1 \ > On 2011/12/22 16:10:39, ambs wrote: > > Note that this does not change any script, JUST documentation. If this > > documentation says you need to copy website.make, then website.make IS THERE. > > No, line 105 copies website.make into $HOME/lilypond/trusted-scripts, not > $HOME/lilypond/ > > However, using website.make from git is certainly a security risk, which I will > fix immediately on the server. Thanks for catching this! Oh, good point. Anyway, that makefile seems that is not being used. It that copy really needed?
Sign in to reply to this message.
On 2011/12/22 16:16:44, Graham Percival wrote: > However, using website.make from git is certainly a security risk, which I will > fix immediately on the server. Thanks for catching this! ick, this is what happens when jobs are left half-done. The server uses make-website.sh, which is defined lower down on the page and copies the website.make itself. I thought we were looking at that part of the docs. I can't remember what that part is doing. Phil? Should this line be ../lilypond-git/....blah/ or just plain website.make ?
Sign in to reply to this message.
On Thu, Dec 22, 2011 at 04:17:23PM +0000, hashashin@gmail.com wrote: > >2) I would not accept this solution even if it worked, because it > involves weird > >hard-coding for the old website. > > Agreed. But solves an issue that is hanging around for.. one year? > I am not selling this as the salvation for the world, but as a patch to > remove that page from newbies looking from lilypond while no lilypond > devel has 30 minutes to copy the PDF files :) Doesn't need a lilypond devel. Just a random user adding the files to the lilypond-extra repo, then adding 2 lines to website.make to copy the pdfs from $LILYPOND_WEB_MEDIA_GIT just like the images and ly-examples. Cheers, - Graham
Sign in to reply to this message.
On Thu, Dec 22, 2011 at 4:25 PM, Graham Percival <graham@percival-music.ca> wrote: > On Thu, Dec 22, 2011 at 04:17:23PM +0000, hashashin@gmail.com wrote: >> >2) I would not accept this solution even if it worked, because it >> involves weird >> >hard-coding for the old website. >> >> Agreed. But solves an issue that is hanging around for.. one year? >> I am not selling this as the salvation for the world, but as a patch to >> remove that page from newbies looking from lilypond while no lilypond >> devel has 30 minutes to copy the PDF files :) > > Doesn't need a lilypond devel. Just a random user adding the > files to the lilypond-extra repo, then adding 2 lines to > website.make to copy the pdfs from $LILYPOND_WEB_MEDIA_GIT just > like the images and ly-examples. working on that. Will poke you when needing some more info (sorry, you ended up being the mentor :))
Sign in to reply to this message.
On 2011/12/22 16:26:57, ambs wrote: > Will poke you when needing some more info (sorry, you ended up being > the mentor :)) ok. I'm not certain if this made its way into any documentation; I think it may only be present in emails to -devel. lilypond-extra repository: https://github.com/gperciva/lilypond-extra
Sign in to reply to this message.
On Thu, Dec 22, 2011 at 4:50 PM, <graham@percival-music.ca> wrote: > On 2011/12/22 16:26:57, ambs wrote: >> >> Will poke you when needing some more info (sorry, you ended up being >> the mentor :)) > lilypond-extra repository: > https://github.com/gperciva/lilypond-extra Thanks, I really didn't find it anywhere :) -- Alberto Simões
Sign in to reply to this message.
Hello, Graham Instead of looking to the documentation files (the texi source files) I wgetted part of the website, and grepped for /web/ URLs. These are some results (not filtered) that show (if I did not grep wrong files) that there are more than just plain pdf or images being linked there. If I am not wrong and we need to fix some of these URLs (namely the language detection script) I would suggest that we do this one step at a time. It might help to organize the work :) Well, the list includes (the grep/sed sequence wasn't that clean, but, it is a beginning) 4 #"http://lilypond.org/web/" 4 \with-url #"http://lilypond.org/web/" { 42 \with-url #"http://lilypond.org/web/" { 11003 "/web/about/browser-language" 104 "http://lilypond.org/web" 2 "http://lilypond.org/web/about/faq" 1 "http://lilypond.org/web/about/faq.html" 9 "http://lilypond.org/web/devel/participating/bugs" 104 "http://lilypond.org/web/images/FISL7-slides.pdf" 94 "http://lilypond.org/web/images/computer-totaal.jpeg" 84 "http://lilypond.org/web/images/thesis-erik-sandberg" 24 "http://lilypond.org/web/images/thesis-erik-sandberg.pdf" 104 "http://lilypond.org/web/images/xivcim.pdf" 320 "http://lilypond.org/web/lilypond-rss-feed.xml" 10 "http://lilypond.org/web/lilypond-rss-feed.xml"/> 1 "http://lilypond.org/web/sponsor/" 2 "http://lilypond.org/web/switch/howto" 1 "http://lilypond.org/web/switch/howto.html" 1 'http://lilypond.org/web/help/'>auf der LilyPond-Hilfeseite</a>. 1 'http://lilypond.org/web/help/'>ezt</a>. 1 'http://lilypond.org/web/help/'>la página de ayuda de LilyPond</a>. 1 'http://lilypond.org/web/help/'>page d'aide de LilyPond</a>. 3 'http://lilypond.org/web/help/'>the LilyPond help page</a>. (yeah, I could clean it a little more, but was lazy). For each URL I can find the file that uses it, in case it is needed. Later (today or tomorrow) I'll do a similar treatment to the texi files. Cheers ambs
Sign in to reply to this message.
On Thu, Dec 22, 2011 at 09:03:30PM +0000, hashashin@gmail.com wrote: > These are some results (not filtered) that show (if I did not grep wrong > files) that there are more than just plain pdf or images being linked > there. Most of those are almost certainly internal links between web/ to web/, so those will disappear as soon as I delete web/. > If I am not wrong and we need to fix some of these URLs (namely the > language detection script) I would suggest that we do this one step at a > time. Hmm, the language detection is _supposed_ to be running on the new website. There would certainly be the old language detection on the old website, but AFAIK we have two separate instances of that running. I'm most concerned about any /web/ that exists after typing "make web". > 104 "http://lilypond.org/web/images/FISL7-slides.pdf" > 24 "http://lilypond.org/web/images/thesis-erik-sandberg.pdf" > 104 "http://lilypond.org/web/images/xivcim.pdf" We need to rescue these. > 320 "http://lilypond.org/web/lilypond-rss-feed.xml" > 10 "http://lilypond.org/web/lilypond-rss-feed.xml"/> We don't have an RSS feed any more, so ignore that. Cheers, - Graham
Sign in to reply to this message.
The detection language script is called by all the documentation files. Some examples below. doc/v2.15/Documentation/web/text-input.nl.html:190: Gebruik van <A HREF="/web/about/browser-language">automatische taalkeuze</A>. doc/v2.15/Documentation/web/text-input.zh.html:78: About <A HREF="/web/about/browser-language">automatic language selection</A>. doc/v2.15/Documentation/web/tiny-examples.cs.html:132: O <A HREF="/web/about/browser-language">automatickém výběru řeči</A>. doc/v2.15/Documentation/web/tiny-examples.de.html:172: Über die <A HREF="/web/about/browser-language">automatische Sprachauswahl</A>. doc/v2.15/Documentation/web/tiny-examples.es.html:171: Acerca de la <A HREF="/web/about/browser-language">selección automática del idioma</A>. doc/v2.15/Documentation/web/tiny-examples.fr.html:173: À propos de la <A HREF="/web/about/browser-language">sélection automatique de la langue</A>. doc/v2.15/Documentation/web/tiny-examples.html:166: About <A HREF="/web/about/browser-language">automatic language selection</A>. doc/v2.15/Documentation/web/tiny-examples.hu.html:129: Az <a href="/web/about/browser-language">automatikus nyelvválasztásról</a>. doc/v2.15/Documentation/web/tiny-examples.it.html:164: About <A HREF="/web/about/browser-language">automatic language selection</A>. doc/v2.15/Documentation/web/tiny-examples.ja.html:114: About <A HREF="/web/about/browser-language">automatic language selection</A>. doc/v2.15/Documentation/web/tiny-examples.nl.html:166: Gebruik van <A HREF="/web/about/browser-language">automatische taalkeuze</A>. doc/v2.15/Documentation/web/tiny-examples.zh.html:70: About <A HREF="/web/about/browser-language">automatic language selection</A>. doc/v2.15/Documentation/web/translated.cs.html:128: O <A HREF="/web/about/browser-language">automatickém výběru řeči</A>. doc/v2.15/Documentation/web/translated.de.html:282: Über die <A HREF="/web/about/browser-language">automatische Sprachauswahl</A>. doc/v2.15/Documentation/web/translated.es.html:285: Acerca de la <A HREF="/web/about/browser-language">selección automática del idioma</A>. will forget this issue, getting back to PDFs. cheers ambs
Sign in to reply to this message.
testing, 1, 2, 3?
Sign in to reply to this message.
Ok, sorry for this test, but something failed some seconds ago. Sending the real message now... There are 4 files that should be preserved. Downloaded them. Where in github should I add them? pictures? Then, there is a rss feed and a /web links in old-news.html.
Sign in to reply to this message.
Let me know if this is what you are thinking: 1. upload those files to github (tell me the folder, I create a pull request) 2. make makefiles copy the files to the correct place 3. change texi files so they point to the new URL (let me know what should be that new URL) 4. change the htaccess files so that old links point to the new files, so that any external link still works 5. remove the reference to /web and to the RSS from old-news (or remove old-news). Is this correct? Let me know what you prefer I start with. Cheers ambs
Sign in to reply to this message.
On Mon, Dec 26, 2011 at 10:23:55PM +0000, hashashin@gmail.com wrote: > Let me know if this is what you are thinking: > > 1. upload those files to github (tell me the folder, I create a pull > request) Let's make a new folder, pdf/ > 2. make makefiles copy the files to the correct place yes. > 3. change texi files so they point to the new URL (let me know what > should be that new URL) hmm... probably whatever the /images/ urls are? Let's hold off on this one for the first round: begin by giving me the pull request in github and changing the makefile to copy those files, then let's see wherever they end up. :) > 4. change the htaccess files so that old links point to the new files, > so that any external link still works No; I don't care if anybody is hotlinking to those pdfs. Those links can break. > 5. remove the reference to /web and to the RSS from old-news (or remove > old-news). I'm not certain about this step. Let's get the pdfs handled first, then come back to this. Cheers, - Graham
Sign in to reply to this message.
github pull request sent. will work next in the copy procedure.
Sign in to reply to this message.
On 2011/12/27 19:41:05, ambs wrote: > github pull request sent. will work next in the copy procedure. Check http://codereview.appspot.com/5507046/edit for continuation on this.
Sign in to reply to this message.
On 2012/01/01 14:52:11, ambs wrote: > On 2011/12/27 19:41:05, ambs wrote: > > github pull request sent. will work next in the copy procedure. > > Check http://codereview.appspot.com/5507046/edit for continuation on this. http://codereview.appspot.com/5507046/ ... :)
Sign in to reply to this message.
After that code merge (hope it has the needed quality) you need to think what to do regarding RSS and web/ links on 'old-news' page. Also, note that documentation is using the web/../languagedetection application.
Sign in to reply to this message.
|