Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed broken links #87

Merged
merged 3 commits into from
Jul 7, 2016
Merged

Fixed broken links #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d80395f
Fixed links
drigodwin Jul 6, 2016
e2fd79b
More links fixed
drigodwin Jul 6, 2016
2c6629e
Updated src repo link
drigodwin Jul 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions _includes/java_link.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@


{% endcomment %}{% if include.project_subpath %}<code>{{ include.class_name }}</code>
(<a href="{{ site.path.guide }}/misc/javadoc/{{ include.package_path }}/{{ include.class_name }}.html">javadoc</a>,
<a href="{{ site.brooklyn.url.git }}/{{ include.project_subpath }}/src/main/java/{{ include.package_path }}/{{ include.class_name }}.java">src</a>){% comment %}
({% comment %}<a href="{{ site.path.guide }}/misc/javadoc/{{ include.package_path }}/{{ include.class_name }}.html">javadoc</a>,
{% endcomment %}<a href="{{ site.brooklyn.url.git }}/{{ include.project_subpath }}/src/main/java/{{ include.package_path }}/{{ include.class_name }}.java">src</a>){% comment %}
{% endcomment %}{% else %}<a href="{{ site.path.guide }}/misc/javadoc/{{ include.package_path }}/{{ include.class_name }}.html">
<code>{{ include.class_name }}</code></a>
{% endif %}{% comment %}
Expand Down
2 changes: 1 addition & 1 deletion _plugins/brooklyn_metadata.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def generate(site)
}
end

url_set["git"] = "https://github.com/apache/brooklyn/tree/#{ git_branch }"
url_set["git"] = "https://github.com/apache/brooklyn-server/tree/#{ git_branch }"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this could be wrong for some classes -- we need a more sophisticated strategy to determine if it's server or library etc (but this is probably good enough for now)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it needs re-working. For this though, I manually checked all the places this is being used and they're all currently in brooklyn-server.


site.config['brooklyn'] = {
"version" => BrooklynMetadata::BROOKLYN_VERSION,
Expand Down
2 changes: 1 addition & 1 deletion guide/java/entities.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ wiring for the sensors, and the effector implementations. In simple cases it may
to capture the behaviour of the effectors in a simple methods.
For example deploying a WAR to a cluster can be done as follows:

*This section is not complete. Feel free to [fork]({{site.path.guide}}/dev/code) the docs and lend a hand.*
*This section is not complete. Feel free to [fork](https://github.com/apache/brooklyn-docs) the docs and lend a hand.*

<!---
TODO show an effector which recurses across children
Expand Down
2 changes: 1 addition & 1 deletion guide/misc/javadoc/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ toc: ../../toc.json

*Javadoc is not available as part of this build.*

Please see the [source code]({{site.path.guide}}/dev/code) to view javadoc.
Please see the [source code](https://github.com/apache/brooklyn) to view javadoc.

<!-- This page is normally overwritten by generated javadoc. -->
2 changes: 1 addition & 1 deletion guide/ops/brooklyn_properties.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ children:
The file `~/.brooklyn/brooklyn.properties` is read when Brooklyn starts
to load server configuration values.
A different properties file can be specified either additionally or instead
through [CLI options](launch.html#configuration-files).
through [CLI options](server-cli-reference.html).

A template [brooklyn.properties]({{brooklyn_properties_url_path}}) file is available,
with abundant comments.
Expand Down
12 changes: 6 additions & 6 deletions guide/ops/production-installation.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,19 @@ To install Apache Brooklyn on a production server:

This guide covers the basics. You may also wish to configure:

* [Logging](logging.md)
* [Logging](logging.html)
* [Persistence](persistence/)
* [High availability](high-availability.md)
* [High availability](high-availability/)


### <a id="prerequisites"></a>Set up the Prerequisites

Check that the server meets the [requirements](requirements.md).
Check that the server meets the [requirements](requirements.html).
Then configure the server as follows:

* install Java JRE or JDK (version 7 or later)
* install an [SSH key]({{ site.path.guide }}/ops/locations/ssh-keys.html), if not available
* enable [passwordless ssh login]({{ site.path.guide }}/ops/locations/ssh-keys.html)
* install an [SSH key]({{ site.path.guide }}/ops/locations/index.html#ssh-keys), if not available
* enable [passwordless ssh login]({{ site.path.guide }}/ops/locations/index.html#ssh-keys)
* create a `~/.brooklyn` directory on the host with `$ mkdir ~/.brooklyn`
* check your `iptables` or other firewall service, making sure that incoming connections on port 8443 is not blocked
* check that the [linux kernel entropy]({{ site.path.website }}/documentation/increase-entropy.html) is sufficient
Expand Down Expand Up @@ -66,7 +66,7 @@ Let's setup some paths for easy commands.

### <a id="configuring-properties"></a>Configuring brooklyn.properties

Set up `brooklyn.properties` as described [here](brooklyn_properties.md):
Set up `brooklyn.properties` as described [here](brooklyn_properties.html):

* Configure the users who should have access
* Turn on HTTPS
Expand Down
2 changes: 1 addition & 1 deletion guide/yaml/ansible/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ children:
---

This guide describes how Brooklyn entities can be created using the Ansible infrastructure management tool
([ansiblestack.com](ansiblestack.com)).
([ansible.com](http://ansible.com)).
At present Brooklyn provides basic support for Ansible, operating in a 'masterless' mode.
Comments on this support and suggestions for further development are welcome.

Expand Down
2 changes: 1 addition & 1 deletion guide/yaml/blueprinting-tips.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ and to use these as the target for a BYON location.
Docker containers provide a convenient way to test blueprints (and also to run blueprints in
production!).

The [Clocker project](www.clocker.io) allows the simple setup of Docker Engine(s), and for Docker
The [Clocker project](http://www.clocker.io) allows the simple setup of Docker Engine(s), and for Docker
containers to be used instead of VMs. For testing, this allows each run to start from a fresh
container (i.e. no install artifacts from previous runs), while taking advantage of the speed
of starting containers.
Expand Down
2 changes: 1 addition & 1 deletion guide/yaml/configuring-vms.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ including:
* `machineCreateAttempts` (for dodgy clouds, and they nearly all fail occasionally!)
* and things like `imageId` and `userMetadata` and disk and networking options (e.g. `autoAssignFloatingIp` for private clouds)

For more information, see [Operations: Locations](../ops/locations/).
For more information, see [Operations: Locations]({{ site.path.guide }}/ops/locations/index.html).
6 changes: 3 additions & 3 deletions guide/yaml/creating-yaml.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Here's a very simple YAML blueprint plan, to explain the structure:
* The `name` is just for the benefit of us humans.

* The `location` specifies where this should be deployed.
If you've [set up passwordless localhost SSH access](../ops/locations/#localhost)
If you've [set up passwordless localhost SSH access]({{ site.path.guide }}/ops/locations/#localhost)
you can use `localhost` as above, but if not, just wait ten seconds for the next example.

* The `services` block takes a list of the typed services we want to deploy.
Expand All @@ -37,7 +37,7 @@ then in the "Create Application" dialog at the web console
(usually [http://127.0.0.1:8081/](http://127.0.0.1:8081/), paste the copied YAML into the "Yaml" tab of the dialog and press "Finish".
There are several other ways to deploy, including `curl` and via the command-line,
and you can configure users, https, persistence, and more,
as described [in the ops guide](../ops/).
as described [in the ops guide]({{ site.path.guide }}/ops/).

[![Web Console](web-console-yaml-700.png "YAML via Web Console")](web-console-yaml.png)

Expand All @@ -57,7 +57,7 @@ Topics to explore next on the topic of YAML blueprints are:
{% include list-children.html %}

Plenty of examples of blueprints exist in the Brooklyn codebase,
so another starting point is to [`git clone`]({{ site.path.guide }}/developers/code/index.html) it
so another starting point is to [`git clone`]({{ site.path.website }}/developers/code/index.html) it
and search for `*.yaml` files therein.

Brooklyn lived as a Java framework for many years before we felt confident
Expand Down
2 changes: 1 addition & 1 deletion guide/yaml/salt/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ children:
---

This guide describes how Brooklyn entities can be created using the Salt infrastructure management tool
([saltstack.com](saltstack.com)).
([saltstack.com](https://saltstack.com/)).
At present Brooklyn provides basic support for Salt, operating in a 'masterless' mode.
Comments on this support and suggestions for further development are welcome.

Expand Down