Skip to content

Commit

Permalink
fix merge conflict in router configuration help template
Browse files Browse the repository at this point in the history
  • Loading branch information
@ThomasWaldmann
ThomasWaldmann committed Aug 16, 2014
1 parent 8dbbd0c commit f2b438a
Showing 1 changed file with 14 additions and 37 deletions.
51 changes: 14 additions & 37 deletions nsupdate/main/templates/main/includes/tabbed_router_configuration.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,55 +180,32 @@ <h5>{% trans "Enter the following data:" %}</h5>
</table>
</div>
<div class="tab-pane" id="browser">
<h4>Browser-based update client</h4>
<h4>{% trans "Browser-based update client" %}</h4>
{% blocktrans %}
These URLs invoke the built-in update client, which is intended for temporary and adhoc scenarios only.
It periodically checks your IP and updates DNS if it changes.{% endblocktrans %}
<ul>
<<<<<<< HEAD
<li><a href="https://{{ host.get_fqdn|default:"&lt;your hostname&gt;" }}:{{ update_secret|default:"&lt;your secret&gt;" }}@{{ WWW_HOST }}/update">update DNS to point to remote ipv4 or ipv6 address</a></li>
<li><a href="https://{{ host.get_fqdn|default:"&lt;your hostname&gt;" }}:{{ update_secret|default:"&lt;your secret&gt;" }}@{{ WWW_IPV4_HOST }}/update">similar, ipv4 only</a></li>
<li><a href="https://{{ host.get_fqdn|default:"&lt;your hostname&gt;" }}:{{ update_secret|default:"&lt;your secret&gt;" }}@{{ WWW_IPV6_HOST }}/update">similar, ipv6 only</a></li>
=======
<li>https://{{ host.get_fqdn|default:"&lt;your hostname&gt;" }}:{{ update_secret|default:"&lt;your secret&gt;" }}@{{ WWW_HOST }}/update {% blocktrans %}(updates hostname to point to remote ipv4 or ipv6 address){% endblocktrans %}</li>
<li>https://{{ host.get_fqdn|default:"&lt;your hostname&gt;" }}:{{ update_secret|default:"&lt;your secret&gt;" }}@{{ WWW_IPV4_HOST }}/update {% blocktrans %}(similar, but ipv4 only){% endblocktrans %}</li>
<li>https://{{ host.get_fqdn|default:"&lt;your hostname&gt;" }}:{{ update_secret|default:"&lt;your secret&gt;" }}@{{ WWW_IPV6_HOST }}/update {% blocktrans %}(similar, but ipv6 only){% endblocktrans %}</li>
>>>>>>> 25449d447b239ccc0599131435c178e831e247d5
<li><a href="https://{{ host.get_fqdn|default:"&lt;your hostname&gt;" }}:{{ update_secret|default:"&lt;your secret&gt;" }}@{{ WWW_HOST }}/update">{% blocktrans %}update DNS to point to remote ipv4 or ipv6 address{% endblocktrans %}</a></li>
<li><a href="https://{{ host.get_fqdn|default:"&lt;your hostname&gt;" }}:{{ update_secret|default:"&lt;your secret&gt;" }}@{{ WWW_IPV4_HOST }}/update">{% blocktrans %}similar, ipv4 only{% endblocktrans %}</a></li>
<li><a href="https://{{ host.get_fqdn|default:"&lt;your hostname&gt;" }}:{{ update_secret|default:"&lt;your secret&gt;" }}@{{ WWW_IPV6_HOST }}/update">{% blocktrans %}similar, ipv6 only{% endblocktrans %}</a></li>
</ul>
<h4>{% trans "Update URLs for browser / http user agent use" %}</h4>
{% blocktrans %}Interactive - will ask for username (give your hostname) and password (give your secret):{% endblocktrans %}
{% trans "Interactive - will ask for username (give your hostname) and password (give your secret):" %}
<ul>
<<<<<<< HEAD
<li><a href="https://{{ WWW_HOST }}/nic/update">update DNS to point to remote ipv4 or ipv6 address</a></li>
<li><a href="https://{{ WWW_IPV4_HOST }}/nic/update">similar, ipv4 only</a></li>
<li><a href="https://{{ WWW_IPV6_HOST }}/nic/update">similar, ipv6 only</a></li>
<li><a href="https://{{ WWW_HOST }}/nic/update">{% blocktrans %}update DNS to point to remote ipv4 or ipv6 address{% endblocktrans %}</a></li>
<li><a href="https://{{ WWW_IPV4_HOST }}/nic/update">{% blocktrans %}similar, ipv4 only{% endblocktrans %}</a></li>
<li><a href="https://{{ WWW_IPV6_HOST }}/nic/update">{% blocktrans %}similar, ipv6 only{% endblocktrans %}</a></li>
</ul>
Giving the http basic auth username and password in the URL:
{% trans "Giving the http basic auth username and password in the URL:" %}
<ul>
<li><a href="https://{{ host.get_fqdn|default:"&lt;your hostname&gt;" }}:{{ update_secret|default:"&lt;your secret&gt;" }}@{{ WWW_HOST }}/nic/update">update DNS to point to remote ipv4 or ipv6 address</a></li>
<li><a href="https://{{ host.get_fqdn|default:"&lt;your hostname&gt;" }}:{{ update_secret|default:"&lt;your secret&gt;" }}@{{ WWW_IPV4_HOST }}/nic/update">similar, ipv4 only</a></li>
<li><a href="https://{{ host.get_fqdn|default:"&lt;your hostname&gt;" }}:{{ update_secret|default:"&lt;your secret&gt;" }}@{{ WWW_IPV6_HOST }}/nic/update">similar, ipv6 only</a></li>
=======
<li>https://{{ WWW_HOST }}/nic/update {% blocktrans %}(updates hostname to point to remote ipv4 or ipv6 address){% endblocktrans %}</li>
<li>https://{{ WWW_IPV4_HOST }}/nic/update {% blocktrans %}(similar, but ipv4 only){% endblocktrans %}</li>
<li>https://{{ WWW_IPV6_HOST }}/nic/update {% blocktrans %}(similar, but ipv6 only){% endblocktrans %}</li>
</ul>
Giving the http basic auth username and password in the URL:
<ul>
<li>https://{{ host.get_fqdn|default:"&lt;your hostname&gt;" }}:{{ update_secret|default:"&lt;your secret&gt;" }}@{{ WWW_HOST }}/nic/update {% blocktrans %}(updates hostname to point to remote ipv4 or ipv6 address){% endblocktrans %}</li>
<li>https://{{ host.get_fqdn|default:"&lt;your hostname&gt;" }}:{{ update_secret|default:"&lt;your secret&gt;" }}@{{ WWW_IPV4_HOST }}/nic/update {% blocktrans %}(similar, but ipv4 only){% endblocktrans %}</li>
<li>https://{{ host.get_fqdn|default:"&lt;your hostname&gt;" }}:{{ update_secret|default:"&lt;your secret&gt;" }}@{{ WWW_IPV6_HOST }}/nic/update {% blocktrans %}(similar, but ipv6 only){% endblocktrans %}</li>
>>>>>>> 25449d447b239ccc0599131435c178e831e247d5
<li><a href="https://{{ host.get_fqdn|default:"&lt;your hostname&gt;" }}:{{ update_secret|default:"&lt;your secret&gt;" }}@{{ WWW_HOST }}/nic/update">{% blocktrans %}update DNS to point to remote ipv4 or ipv6 address{% endblocktrans %}</a></li>
<li><a href="https://{{ host.get_fqdn|default:"&lt;your hostname&gt;" }}:{{ update_secret|default:"&lt;your secret&gt;" }}@{{ WWW_IPV4_HOST }}/nic/update">{% blocktrans %}similar, ipv4 only{% endblocktrans %}</a></li>
<li><a href="https://{{ host.get_fqdn|default:"&lt;your hostname&gt;" }}:{{ update_secret|default:"&lt;your secret&gt;" }}@{{ WWW_IPV6_HOST }}/nic/update">{% blocktrans %}similar, ipv6 only{% endblocktrans %}</a></li>
</ul>
{% trans "As above, but manually specifying the IP address:" %}
<ul>
<<<<<<< HEAD
<li><a href="https://{{ host.get_fqdn|default:"&lt;your hostname&gt;" }}:{{ update_secret|default:"&lt;your secret&gt;" }}@{{ WWW_HOST }}/nic/update?myip=127.0.0.1">update DNS to point to ipv4 127.0.0.1</a></li>
<li><a href="https://{{ host.get_fqdn|default:"&lt;your hostname&gt;" }}:{{ update_secret|default:"&lt;your secret&gt;" }}@{{ WWW_HOST }}/nic/update?myip=::1">update DNS to point to ipv6 ::1</a></li>
=======
<li>https://{{ host.get_fqdn|default:"&lt;your hostname&gt;" }}:{{ update_secret|default:"&lt;your secret&gt;" }}@{{ WWW_HOST }}/nic/update?myip=127.0.0.1 {% blocktrans %}(updates hostname to point to ipv4 127.0.0.1){% endblocktrans %}</li>
<li>https://{{ host.get_fqdn|default:"&lt;your hostname&gt;" }}:{{ update_secret|default:"&lt;your secret&gt;" }}@{{ WWW_HOST }}/nic/update?myip=::1 {% blocktrans %}(updates hostname to point to ipv6 ::1){% endblocktrans %}</li>
>>>>>>> 25449d447b239ccc0599131435c178e831e247d5
<li><a href="https://{{ host.get_fqdn|default:"&lt;your hostname&gt;" }}:{{ update_secret|default:"&lt;your secret&gt;" }}@{{ WWW_HOST }}/nic/update?myip=127.0.0.1">{% blocktrans %}update DNS to point to ipv4 127.0.0.1{% endblocktrans %}</a></li>
<li><a href="https://{{ host.get_fqdn|default:"&lt;your hostname&gt;" }}:{{ update_secret|default:"&lt;your secret&gt;" }}@{{ WWW_HOST }}/nic/update?myip=::1">{% blocktrans %}update DNS to point to ipv6 ::1{% endblocktrans %}</a></li>
</ul>
{% trans "Explanation of parameters:" %}
<ul>
Expand Down

0 comments on commit f2b438a

Please sign in to comment.