grahamc/hydra2 - Change IQ5NESOOULVKGJUTRI5OWLMNCSIASMBKHNVD6ANU4W3ROYWBGCDAC

machines: Read /etc/nix.machines instead of using the BuildMachines table

Created by Shea Levy on March 4, 2013

IQ5NESOOULVKGJUTRI5OWLMNCSIASMBKHNVD6ANU4W3ROYWBGCDAC

Dependencies

In channels

main

Change contents

Replacement in src/lib/Hydra/Controller/Admin.pm at line 59 [4.1]

B:BD[3.1580] → [3.1580:1938]

    $c->stash->{machines} = [$c->model('DB::BuildMachines')->search({}, {order_by => "hostname"})];
    $c->stash->{systems} = [$c->model('DB::SystemTypes')->search({}, {select => ["system"], order_by => "system" })];
    $c->stash->{nixMachines} = nixMachines($c);
    $c->stash->{nixMachinesWritable} = (-e "/etc/nix.machines" && -w "/etc/nix.machines");

[3.1580]

[3.1938]

    $c->stash->{machines} = getMachines;

Replacement in src/root/machines.tt at line 11 [5.2473]
∅:D[2.13416] → [5.2725:2796]
B:BD[5.2725] → [5.2725:2796]
```
            [% FOREACH s IN systems %]<th>[% s.system %]</th>[% END %]
```
[2.13416]
[5.2796]
```
            <th>Systems</th>
```

Replacement in src/root/machines.tt at line 17 [5.2473]

B:BD[5.2884] → [5.2884:3162]

B:BD[5.3162] → [2.13417:13549]

∅:D[2.13549] → [5.3308:3821]

B:BD[5.3308] → [5.3308:3821]

            <td><input type="checkbox" name="enabled" [% IF m.enabled == 1  %]CHECKED[% END %] onclick="window.location='[% IF m.enabled == 1 %][%c.uri_for('/admin/machine' m.hostname 'disable' )%][% ELSE %][%c.uri_for('/admin/machine' m.hostname 'enable' )%][% END %]'"/></td>
            <td><a href="[% c.uri_for(c.controller('Admin').action_for('machine_edit'), [m.hostname]) %]">[% m.hostname %]</a></td>
            <td>[% m.maxconcurrent %]</td>
            <td>[% m.speedfactor %]</td>
            [% FOREACH s IN systems %]
                <td>
                [% checked = false %]
                [% FOREACH ms IN m.buildmachinesystemtypes %]
                    [% checked = ms.system == s.system  %]
                    [% BREAK IF checked %]
                [% END %]
                <input type="checkbox" name="system" DISABLED [% IF checked %]CHECKED[% END %]/>
                </td>
            [% END %]

[5.2884]

[5.3821]

            <td><input type="checkbox" name="enabled" [% IF m.value.maxJobs > 0  %]CHECKED[% END %] disabled="true" /></td>
            <td>[% m.key %]</a></td>
            <td>[% m.value.maxJobs %]</td>
            <td>[% m.value.speedFactor %]</td>
            <td>
                [% comma=0; FOREACH system IN m.value.systemTypes %][% IF comma; %], [% ELSE; comma = 1; END; system; END %]
            </td>

Deletion in src/root/machines.tt at line 30 [5.2473]

B:BD[5.3993] → [2.13550:13695]

B:BD[5.4145] → [5.4145:4146]

<p><a class="btn" href="[% c.uri_for(c.controller('Admin').action_for('create_machine')) %]"><i class="icon-plus"></i> Add a new machine</a></p>