+1
On 20 March 2018 at 19:11, Kevin Fenzi <kevin@xxxxxxxxx> wrote:
> On 03/20/2018 07:59 AM, Ricky Elrod wrote:
>> +1 here
>
> So, I applied this and it worked fine... however, it broke our
> monitoring. We hit a package from noc01 and now it's a redirect to
> src.fedoraproject.org so it errors on it.
>
> I'd like to apply the following and run the noc playbook.
>
> Basically it adds a new check_website_follow check that follows the 302
> redirect. In many cases we don't want that, but in this case it will
> tell us that: a) the web server on pkgs is working to generate the 302,
> b) src.fedoraproject.org/pagure is working to return the correct data
> from the git repo.
>
> +1s?
>
> diff --git a/roles/nagios_server/files/nagios/commands/httpd.cfg
> b/roles/nagios_server/files/nagios/commands/httpd.cfg
> index 4771ea5..944cb50 100644
> --- a/roles/nagios_server/files/nagios/commands/httpd.cfg
> +++ b/roles/nagios_server/files/nagios/commands/httpd.cfg
> @@ -47,6 +47,11 @@ define command{
> }
>
> define command{
> + command_name check_website_follow
> + command_line $USER1$/check_http -w 30 -c 40 -I $HOSTADDRESS$
> -H $ARG1$ -u "$ARG2$" -s "$ARG3$" -f follow
> +}
> +
> +define command{
> command_name check_website_ppc
> command_line $USER1$/check_http -w 300 -c 400 -I
> $HOSTADDRESS$ -H $ARG1$ -u "$ARG2$" -s "$ARG3$"
> }
> diff --git
> a/roles/nagios_server/templates/nagios/services/websites.cfg.j2
> b/roles/nagios_server/templates/nagios/serv
> index 8f86f73..67e74c0 100644
> --- a/roles/nagios_server/templates/nagios/services/websites.cfg.j2
> +++ b/roles/nagios_server/templates/nagios/services/websites.cfg.j2
> @@ -301,7 +301,7 @@ define service {
> define service {
> hostgroup_name pkgs
> service_description http-pkgs-pagure
> - check_command check_website!localhost!/rpms/moreutils!The
> moreutils rpms
> + check_command
> check_website_follow!localhost!/rpms/moreutils!The moreutils rpms
> use websitetemplate
> }
>
>
>
>>
>> -re
>>
>> On Tue, Mar 20, 2018 at 3:52 AM, Pierre-Yves Chibon <pingou@xxxxxxxxxxxx> wrote:
>>> On Mon, Mar 19, 2018 at 11:28:45AM -0700, Kevin Fenzi wrote:
>>>> Greetings.
>>>>
>>>> I'd like to apply the following ansible patch and run the pkgs playbook.
>>>>
>>>> This will make our pkgs redirect handle redirecting more than / and keep
>>>> links in bugs alive pointing to the new location.
>>>>
>>>> See ticket: https://pagure.io/fedora-infrastructure/issue/6785 for more
>>>> details.
>>>>
>>>> +1s?
>>>>
>>>> kevin
>>>> --
>>>> diff --git a/roles/distgit/templates/lookaside-upload.conf
>>>> b/roles/distgit/templates/lookaside-upload.conf
>>>> index dc2b882..716a166 100644
>>>> --- a/roles/distgit/templates/lookaside-upload.conf
>>>> +++ b/roles/distgit/templates/lookaside-upload.conf
>>>> @@ -39,7 +39,7 @@ Alias /robots.txt /var/www/robots-src.txt
>>>> </Location>
>>>>
>>>> RewriteEngine on
>>>> - RewriteRule "^/$" "https://src{{ env_suffix }}.fedoraproject.org/"
>>>> + RewriteRule "^/(.*)$" "https://src{{ env_suffix
>>>> }}.fedoraproject.org/$1"
>>>> RewriteRule "^/login/$" "https://src{{ env_suffix
>>>> }}.fedoraproject.org/login/"
>>>> </VirtualHost>
>>>
>>> +1 for me
>>>
>>>
>>> Pierre
>>>
>>> _______________________________________________
>>> infrastructure mailing list -- infrastructure@xxxxxxxxxxxxxxxxxxxxxxx
>>> To unsubscribe send an email to infrastructure-leave@xxxxxxxxxxxxxxxxxxxxxxx
>>>
>> _______________________________________________
>> infrastructure mailing list -- infrastructure@xxxxxxxxxxxxxxxxxxxxxxx
>> To unsubscribe send an email to infrastructure-leave@xxxxxxxxxxxxxxxxxxxxxxx
>>
>
>
>
> _______________________________________________
> infrastructure mailing list -- infrastructure@xxxxxxxxxxxxxxxxxxxxxxx
> To unsubscribe send an email to infrastructure-leave@xxxxxxxxxxxxxxxxxxxxxxx
>
--
Stephen J Smoogen.
_______________________________________________
infrastructure mailing list -- infrastructure@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to infrastructure-leave@xxxxxxxxxxxxxxxxxxxxxxx
