Re: Freeze break requeest: add script to make OpenVPN always fix its routes
It's 3:00am so it may take a while for others to read, so if it'll speed things up for you I obviously trust Smooge's judgment - a retro +1 [I'm not an official infra member yet so it may not count but it's worth a try] On Thu, Oct 22, 2015 at 11:14 PM, Patrick Uiterwijkwrote: > There is still some annoying thing in OpenVPN that's refusing to run the > script. > I have reverted the change that makes openvpn run the script automatically > and will look > that up further in the morning, I have left the script itself in place as > it's useful. > > retrospective +1s requested. > > > The change: > > commit b2b07e8bcda3f2ff3352ad5c1dd8bc5fcb895e32 > Author: Patrick Uiterwijk > Date: Fri Oct 23 03:11:02 2015 + > > Running the script doesnt work yet. But we still want the script. > > Signed-off-by: Patrick Uiterwijk > > diff --git a/roles/openvpn/client/files/client.conf > b/roles/openvpn/client/files/client.conf > index 704becb..307a357 100644 > --- a/roles/openvpn/client/files/client.conf > +++ b/roles/openvpn/client/files/client.conf > @@ -14,8 +14,8 @@ nobind > > persist-key > > -up /etc/openvpn/fix-routes.sh > -up-restart > +#up /etc/openvpn/fix-routes.sh > +#up-restart > > ca ca.crt > cert client.crt > > > > > Count this as a +2 and get a retroactive 1 later. Dropping vpn because > > of this would be worse than waiting for it. > > > > On 22 October 2015 at 20:45, Patrick Uiterwijk > wrote: > > > And I just realized I need to remove the exit 2, because this will make > > > openvpn exit. > > > > > > Can I get +1s to this change to the script? > > > > > > > > > > > > commit 50511a65e7dbdf0a60ad1cc43a6fa2fddec66ed3 > > > Author: Patrick Uiterwijk > > > Date: Fri Oct 23 02:41:01 2015 + > > > > > > Make fix-routes not terminate with status 2 if it fixed it > > > > > > This will make openvpn think something went wrong and terminate the > > > connection. > > > I did this to make it easily visible when running with ansible, > but in > > > this case > > > it messes things up. > > > > > > Signed-off-by: Patrick Uiterwijk > > > > > > diff --git a/roles/openvpn/client/files/fix-routes.sh > > > b/roles/openvpn/client/files/fix-routes.sh > > > index a08e519..44a9450 100644 > > > --- a/roles/openvpn/client/files/fix-routes.sh > > > +++ b/roles/openvpn/client/files/fix-routes.sh > > > @@ -8,5 +8,5 @@ then > > > # 2. Add a new route to 192.168.0.0/16 via that IP addres > (from > > > xargs on) > > > # 3. Print "Fixed VPN" and exit with code 2 to indicate that it > > > changed > > > # Note: I've been told that the grep and awk can be in one > command, > > > and I believe that, but I find this clearer. > > > - (ip route show | grep '192.168.0.0/16') || ((ip route show | > grep > > > '192.168.0.' | awk '{print $1}' | xargs ip route add 192.168.0.0/16 > via) > > > && echo "Fixed VPN" && exit 2); > > > + (ip route show | grep '192.168.0.0/16') || ((ip route show | > grep > > > '192.168.0.' | awk '{print $1}' | xargs ip route add 192.168.0.0/16 > via) > > > && echo "Fixed VPN"); > > > fi > > > ___ > > > infrastructure mailing list > > > infrastructure@lists.fedoraproject.org > > > > http://lists.fedoraproject.org/admin/infrastructure@lists.fedoraproject.org > > > > > > > > -- > > Stephen J Smoogen. > > ___ > > infrastructure mailing list > > infrastructure@lists.fedoraproject.org > > > http://lists.fedoraproject.org/admin/infrastructure@lists.fedoraproject.org > > > ___ > infrastructure mailing list > infrastructure@lists.fedoraproject.org > http://lists.fedoraproject.org/admin/infrastructure@lists.fedoraproject.org > ___ infrastructure mailing list infrastructure@lists.fedoraproject.org http://lists.fedoraproject.org/admin/infrastructure@lists.fedoraproject.org
Re: [PATCH] koji directory cleanup: shorten the time we keep things
+1 - Original Message - > From: Dennis Gilmore> > keep data in the work for 2 weeks > keep scratch builds 2 weeks > keep koschei builds for 1 day > > Signed-off-by: Dennis Gilmore > --- > roles/koji_hub/files/koji-directory-cleanup | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/roles/koji_hub/files/koji-directory-cleanup > b/roles/koji_hub/files/koji-directory-cleanup > index 67a3018..4429235 100644 > --- a/roles/koji_hub/files/koji-directory-cleanup > +++ b/roles/koji_hub/files/koji-directory-cleanup > @@ -1,2 +1,3 @@ > -0 8 * * * apache find /mnt/koji/work-xdev -depth -mindepth 2 -mtime +28 > \( -type f -o -type l \) -delete -o -type d -empty -delete > -0 9 * * * apache find /mnt/koji/scratch -xdev -depth -mtime +21 > \( -type f -o -type l \) -delete -o -type d -empty -delete > +0 8 * * * apache find /mnt/koji/work-xdev -depth -mindepth 2 -mtime +14 > \( -type f -o -type l \) -delete -o -type d -empty -delete > +0 9 * * * apache find /mnt/koji/scratch -xdev -depth -mtime +14 > \( -type f -o -type l \) -delete -o -type d -empty -delete > +0 9 * * * apache find /mnt/koji/scratch/koschei -xdev -depth -mtime +1 > \( -type f -o -type l \) -delete -o -type d -empty -delete > -- > 1.8.3.1 > ___ > infrastructure mailing list > infrastructure@lists.fedoraproject.org > http://lists.fedoraproject.org/admin/infrastructure@lists.fedoraproject.org > ___ infrastructure mailing list infrastructure@lists.fedoraproject.org http://lists.fedoraproject.org/admin/infrastructure@lists.fedoraproject.org
Re: [PATCH] koji directory cleanup: shorten the time we keep things
On Friday, October 23, 2015 03:25:15 PM Stephen John Smoogen wrote: > +1 > > On 23 October 2015 at 15:20, Patrick Uiterwijkwrote: > > +1 > > Applied thanks Dennis signature.asc Description: This is a digitally signed message part. ___ infrastructure mailing list infrastructure@lists.fedoraproject.org http://lists.fedoraproject.org/admin/infrastructure@lists.fedoraproject.org
Re: Freeze break requeest: add script to make OpenVPN always fix its routes
On Thu, Oct 22, 2015 at 11:14:03PM -0400, Patrick Uiterwijk wrote: > There is still some annoying thing in OpenVPN that's refusing to run the > script. > I have reverted the change that makes openvpn run the script automatically > and will look > that up further in the morning, I have left the script itself in place as > it's useful. > > retrospective +1s requested. +1 for me > The change: > > commit b2b07e8bcda3f2ff3352ad5c1dd8bc5fcb895e32 > Author: Patrick Uiterwijk> Date: Fri Oct 23 03:11:02 2015 + > > Running the script doesnt work yet. But we still want the script. > > Signed-off-by: Patrick Uiterwijk > > diff --git a/roles/openvpn/client/files/client.conf > b/roles/openvpn/client/files/client.conf > index 704becb..307a357 100644 > --- a/roles/openvpn/client/files/client.conf > +++ b/roles/openvpn/client/files/client.conf > @@ -14,8 +14,8 @@ nobind > > persist-key > > -up /etc/openvpn/fix-routes.sh > -up-restart > +#up /etc/openvpn/fix-routes.sh > +#up-restart > > ca ca.crt > cert client.crt > > > > > Count this as a +2 and get a retroactive 1 later. Dropping vpn because > > of this would be worse than waiting for it. > > > > On 22 October 2015 at 20:45, Patrick Uiterwijk > > wrote: > > > And I just realized I need to remove the exit 2, because this will make > > > openvpn exit. > > > > > > Can I get +1s to this change to the script? > > > > > > > > > > > > commit 50511a65e7dbdf0a60ad1cc43a6fa2fddec66ed3 > > > Author: Patrick Uiterwijk > > > Date: Fri Oct 23 02:41:01 2015 + > > > > > > Make fix-routes not terminate with status 2 if it fixed it > > > > > > This will make openvpn think something went wrong and terminate the > > > connection. > > > I did this to make it easily visible when running with ansible, but in > > > this case > > > it messes things up. > > > > > > Signed-off-by: Patrick Uiterwijk > > > > > > diff --git a/roles/openvpn/client/files/fix-routes.sh > > > b/roles/openvpn/client/files/fix-routes.sh > > > index a08e519..44a9450 100644 > > > --- a/roles/openvpn/client/files/fix-routes.sh > > > +++ b/roles/openvpn/client/files/fix-routes.sh > > > @@ -8,5 +8,5 @@ then > > > # 2. Add a new route to 192.168.0.0/16 via that IP addres (from > > > xargs on) > > > # 3. Print "Fixed VPN" and exit with code 2 to indicate that it > > > changed > > > # Note: I've been told that the grep and awk can be in one > > > command, > > > and I believe that, but I find this clearer. > > > - (ip route show | grep '192.168.0.0/16') || ((ip route show | grep > > > '192.168.0.' | awk '{print $1}' | xargs ip route add 192.168.0.0/16 via) > > > && echo "Fixed VPN" && exit 2); > > > + (ip route show | grep '192.168.0.0/16') || ((ip route show | grep > > > '192.168.0.' | awk '{print $1}' | xargs ip route add 192.168.0.0/16 via) > > > && echo "Fixed VPN"); > > > fi > > > ___ > > > infrastructure mailing list > > > infrastructure@lists.fedoraproject.org > > > http://lists.fedoraproject.org/admin/infrastructure@lists.fedoraproject.org > > > > > > > > -- > > Stephen J Smoogen. > > ___ > > infrastructure mailing list > > infrastructure@lists.fedoraproject.org > > http://lists.fedoraproject.org/admin/infrastructure@lists.fedoraproject.org > > > ___ > infrastructure mailing list > infrastructure@lists.fedoraproject.org > http://lists.fedoraproject.org/admin/infrastructure@lists.fedoraproject.org > pgpI5iIlHZ16Y.pgp Description: PGP signature ___ infrastructure mailing list infrastructure@lists.fedoraproject.org http://lists.fedoraproject.org/admin/infrastructure@lists.fedoraproject.org