You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@forrest.apache.org by Gavin <ga...@16degrees.com.au> on 2008/09/14 12:23:01 UTC
Forrest site down
I notice forrest site is down.
On inspection, our .htaccess is messed up with <<<<<MINE etc etc..
Attempting to fix on mino then will svn up.
Gav...
Re: Forrest site down
Posted by David Crossley <cr...@apache.org>.
Gavin wrote:
>
> No perms to write to your home dir so
>
> /tmp/.htaccess.backup
>
> Pretty sure the version I renamed to .htaccess will be the same as you have,
>
> just the matter of whether we lost it being versioned properly I guess?
Thanks, got it. You are correct - same as current.
Well i don't know what the conflicts were then.
Forget it. Thanks.
-David
RE: Forrest site down
Posted by Gavin <ga...@16degrees.com.au>.
> -----Original Message-----
> From: David Crossley [mailto:crossley@apache.org]
> Sent: Sunday, 14 September 2008 11:16 PM
> To: dev@forrest.apache.org
> Subject: Re: Forrest site down
>
> Gavin wrote:
> > From: David Crossley
> > > Gavin wrote:
> > > > From: David Crossley
> > > > >
> > > > > There must have been manual changes on the server that
> > > > > were not added to our SVN.
> > > >
> > > > Strange, I looked at yesterdays backup on bia and there were no
> version
> > > > conflicts.
> > >
> > > No becuase i only made the SVN change to .htaccess
> > > in the last few hours.
> > >
> > > That will be the file that we need. It should
> > > have the local changes.
> >
> > Do you want me to restore that file so you can commit your RedirectMatch
> > again ?
>
> Could iyou just grab the file and put in my home
> directory on people.a.o.
>
> I wouldn't like to mess with our svn checkout.
>
> I will merge the old manual changes.
No perms to write to your home dir so
/tmp/.htaccess.backup
Pretty sure the version I renamed to .htaccess will be the same as you have,
just the matter of whether we lost it being versioned properly I guess?
Gav...
>
> -David
>
>
> --
> No virus found in this incoming message.
> Checked by AVG.
> Version: 7.5.524 / Virus Database: 270.6.21 - Release Date: 9/11/2008
> 12:00 AM
Re: Forrest site down
Posted by David Crossley <cr...@apache.org>.
Gavin wrote:
> From: David Crossley
> > Gavin wrote:
> > > From: David Crossley
> > > >
> > > > There must have been manual changes on the server that
> > > > were not added to our SVN.
> > >
> > > Strange, I looked at yesterdays backup on bia and there were no version
> > > conflicts.
> >
> > No becuase i only made the SVN change to .htaccess
> > in the last few hours.
> >
> > That will be the file that we need. It should
> > have the local changes.
>
> Do you want me to restore that file so you can commit your RedirectMatch
> again ?
Could iyou just grab the file and put in my home
directory on people.a.o.
I wouldn't like to mess with our svn checkout.
I will merge the old manual changes.
-David
RE: Forrest site down
Posted by Gavin <ga...@16degrees.com.au>.
> -----Original Message-----
> From: David Crossley [mailto:crossley@apache.org]
> Sent: Sunday, 14 September 2008 9:26 PM
> To: dev@forrest.apache.org
> Subject: Re: Forrest site down
>
> Gavin wrote:
> > From: David Crossley
> > > Gavin wrote:
> > > > From: Gavin wrote:
> > > > >
> > > > > I notice forrest site is down.
> > > > >
> > > > > On inspection, our .htaccess is messed up with <<<<<MINE etc etc..
> > > > >
> > > > > Attempting to fix on mino then will svn up.
> > > >
> > > > I have removed all version clashes such as :-
> > > >
> > > > rm -rf .htaccess
> > > > rm -rf.htaccess.mine
> > > > rm -rf .htaccess.r695133
> > > > mv .htaccess.r695140 .htaccess
> > >
> > > There must have been manual changes on the server that
> > > were not added to our SVN.
> >
> > Strange, I looked at yesterdays backup on bia and there were no version
> > conflicts.
>
> No becuase i only made the SVN change to .htaccess
> in the last few hours.
>
> That will be the file that we need. It should
> have the local changes.
Do you want me to restore that file so you can commit your RedirectMatch
again ?
Gav...
>
> -David
>
>
> --
> No virus found in this incoming message.
> Checked by AVG.
> Version: 7.5.524 / Virus Database: 270.6.21 - Release Date: 9/11/2008
> 12:00 AM
Re: Forrest site down
Posted by David Crossley <cr...@apache.org>.
Gavin wrote:
> From: David Crossley
> > Gavin wrote:
> > > From: Gavin wrote:
> > > >
> > > > I notice forrest site is down.
> > > >
> > > > On inspection, our .htaccess is messed up with <<<<<MINE etc etc..
> > > >
> > > > Attempting to fix on mino then will svn up.
> > >
> > > I have removed all version clashes such as :-
> > >
> > > rm -rf .htaccess
> > > rm -rf.htaccess.mine
> > > rm -rf .htaccess.r695133
> > > mv .htaccess.r695140 .htaccess
> >
> > There must have been manual changes on the server that
> > were not added to our SVN.
>
> Strange, I looked at yesterdays backup on bia and there were no version
> conflicts.
No becuase i only made the SVN change to .htaccess
in the last few hours.
That will be the file that we need. It should
have the local changes.
-David
RE: Forrest site down
Posted by Gavin <ga...@16degrees.com.au>.
> -----Original Message-----
> From: David Crossley [mailto:crossley@apache.org]
> Sent: Sunday, 14 September 2008 8:50 PM
> To: dev@forrest.apache.org
> Subject: Re: Forrest site down
>
> Gavin wrote:
> > From: Gavin wrote:
> > >
> > > I notice forrest site is down.
> > >
> > > On inspection, our .htaccess is messed up with <<<<<MINE etc etc..
> > >
> > > Attempting to fix on mino then will svn up.
> >
> > I have removed all version clashes such as :-
> >
> > rm -rf .htaccess
> > rm -rf.htaccess.mine
> > rm -rf .htaccess.r695133
> > mv .htaccess.r695140 .htaccess
>
> There must have been manual changes on the server that
> were not added to our SVN.
Strange, I looked at yesterdays backup on bia and there were no version
conflicts.
>
> Did you save a copy? I guess not, going by those commands.
No sorry, next time I'll just rename to .old or something if you want
to investigate.
>
> Be careful of using "rm -rf" that will be recursive.
oops yes, bad habit. I hope there aren't any further nested, otherwise
another publish will be required.
>
> Sorry about that. When doing changs to .htaccess
> i should have tested it with the proxy trick shown here:
> http://apache.org/dev/project-site.html
no worries, I did that after my editing and the site is up by proxy.
>
> I am at dinner now. Will try to look into it soon.
>
Enjoy dinner.
Gav...
> -David
>
> > will have to wait and see if eos picks this up or if we need to do any
> more
> > that end.
> >
> > > Gav...
>
>
> --
> No virus found in this incoming message.
> Checked by AVG.
> Version: 7.5.524 / Virus Database: 270.6.21 - Release Date: 9/11/2008
> 12:00 AM
Re: Forrest site down
Posted by David Crossley <cr...@apache.org>.
Gavin wrote:
> From: Gavin wrote:
> >
> > I notice forrest site is down.
> >
> > On inspection, our .htaccess is messed up with <<<<<MINE etc etc..
> >
> > Attempting to fix on mino then will svn up.
>
> I have removed all version clashes such as :-
>
> rm -rf .htaccess
> rm -rf.htaccess.mine
> rm -rf .htaccess.r695133
> mv .htaccess.r695140 .htaccess
There must have been manual changes on the server that
were not added to our SVN.
Did you save a copy? I guess not, going by those commands.
Be careful of using "rm -rf" that will be recursive.
Sorry about that. When doing changs to .htaccess
i should have tested it with the proxy trick shown here:
http://apache.org/dev/project-site.html
I am at dinner now. Will try to look into it soon.
-David
> will have to wait and see if eos picks this up or if we need to do any more
> that end.
>
> > Gav...
RE: Forrest site down
Posted by Gavin <ga...@16degrees.com.au>.
> -----Original Message-----
> From: Gavin [mailto:gavin@16degrees.com.au]
> Sent: Sunday, 14 September 2008 8:23 PM
> To: dev@forrest.apache.org
> Subject: Forrest site down
>
> I notice forrest site is down.
>
> On inspection, our .htaccess is messed up with <<<<<MINE etc etc..
>
> Attempting to fix on mino then will svn up.
I have removed all version clashes such as :-
rm -rf .htaccess
rm -rf.htaccess.mine
rm -rf .htaccess.r695133
mv .htaccess.r695140 .htaccess
will have to wait and see if eos picks this up or if we need to do any more
that end.
>
> Gav...
>
>
>
> --
> No virus found in this incoming message.
> Checked by AVG.
> Version: 7.5.524 / Virus Database: 270.6.21 - Release Date: 9/11/2008
> 12:00 AM