Skip to content
Permalink
Browse files
replace site.url with site.path.website
  • Loading branch information
ahgittin committed Dec 15, 2014
1 parent 96afcc7 commit b4ee7ffeaf6fa03003b32561133b05d12a5a74e7
Showing 8 changed files with 25 additions and 24 deletions.
@@ -14,10 +14,11 @@
url_root: http://0.0.0.0:4000

path:
style: /website/style
website: /website

# site.url is deprecated in favour of site.path.website
url: http://0.0.0.0:4000/website
# url: http://0.0.0.0:4000/website

# this is the instruction to jekyll to put things under /website dir
baseurl: /website
@@ -6,8 +6,8 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href="{% dependency_url bootstrap.css %}" rel="stylesheet">
<link href="{{site.url}}/style/deps/bootstrap-theme.css" rel="stylesheet">
<link href="{{site.url}}/style/css/website.css" rel="stylesheet">
<link href="{{site.path.website}}/style/deps/bootstrap-theme.css" rel="stylesheet">
<link href="{{site.path.website}}/style/css/website.css" rel="stylesheet">
</head>

<body>
@@ -23,7 +23,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
{% if page.navgroup != 'home' %}<a class="navbar-brand" href="{{site.url}}"><img src="{{site.url}}/style/img/apache-brooklyn-logo-244px-wide.png" alt="brooklyn"></a>{% endif %}
{% if page.navgroup != 'home' %}<a class="navbar-brand" href="{{site.path.website}}/"><img src="{{site.path.website}}/style/img/apache-brooklyn-logo-244px-wide.png" alt="brooklyn"></a>{% endif %}
</div>

<!-- Collect the nav links, forms, and other content for toggling -->
@@ -32,21 +32,21 @@
{% for navgroup in site.data.navgroups %}
{% if navgroup.page.menu2 %}
<li class="dropdown{% if page.navgroup == navgroup.id %} active{% endif %}">
<a href="{{site.url}}{{navgroup.page.url}}">{{navgroup.title}}</a>
<a href="{{site.path.website}}{{navgroup.page.url}}">{{navgroup.title}}</a>
<ul class="dropdown-menu" role="menu">
<li>
<a href="{{site.url}}{{navgroup.page.url}}">{{navgroup.title_in_menu}}</a>
<a href="{{site.path.website}}{{navgroup.page.url}}">{{navgroup.title_in_menu}}</a>
</li>
<li class="divider"></li>
{% for child in navgroup.page.menu2 %}
<li>
<a href="{{site.url}}{{child.reference.url}}">{{child.reference.title}}</a>
<a href="{{site.path.website}}{{child.reference.url}}">{{child.reference.title}}</a>
</li>
{% endfor %}
</ul>
</li><!-- {{ navgroup.id }} -->
{% else %}
<li class="{% if page.navgroup == navgroup.id %}active{% endif %}"><a href="{{site.url}}{{navgroup.page.url}}">{{navgroup.title}}</a></li><!-- {{ navgroup.id }} -->
<li class="{% if page.navgroup == navgroup.id %}active{% endif %}"><a href="{{site.path.website}}{{navgroup.page.url}}">{{navgroup.title}}</a></li><!-- {{ navgroup.id }} -->
{% endif %}
{% endfor %}
</ul>
@@ -11,9 +11,9 @@ <h1>{{ page.title }}</h1>
<div class="col-md-3">
{% if page.menu2 %}
<div class="list-group">
<h4><a href="{{site.url}}{{page.menu2parent.url}}" class="list-group-item{% if page.menu2parent.path == page.path %} active{% endif %}">{{ page.menu2parent.title }}</a></h4>
<h4><a href="{{site.path.website}}{{page.menu2parent.url}}" class="list-group-item{% if page.menu2parent.path == page.path %} active{% endif %}">{{ page.menu2parent.title }}</a></h4>
{% for child in page.menu2 %}
<a href="{{site.url}}{{child.reference.url}}" class="list-group-item{% if child.reference.path == page.path %} active{% endif %}">{{ child.reference.title }}</a>
<a href="{{site.path.website}}{{child.reference.url}}" class="list-group-item{% if child.reference.path == page.path %} active{% endif %}">{{ child.reference.title }}</a>
{% endfor %}
</div>
{% endif %}
@@ -1,7 +1,7 @@
# tag to write the correct URL depending whether we are running with dependencies local (for offline) or remote (eg using a CDN)

# specify a map of <basename>: <remote_url> in the key `dependency_urls` in your `_config.yml`,
# then, if `dependency_mode: local` is defined, the path `{{site.url}//style/deps/<basename>` will be used,
# then, if `dependency_mode: local` is defined, the path `{{site.path.style}}/deps/<basename>` will be used,
# otherwise the <remote_url> will be used

module JekyllDependencyUrl
@@ -20,7 +20,7 @@ def render(context)
end
end
if result.to_s == ''
result = context['site']['url'] + "/style/deps/" + @text.strip
result = context['site']['path']['style'] + "/deps/" + @text.strip
end
return result
end
@@ -11,9 +11,9 @@ children:

Our main user manual is organised by release version. Please pick the version that you are using:

- [0.7.0-M1]({{ site.url }}/v/0.7.0-M1) -
- [0.7.0-M1]({{ site.path.website }}/v/0.7.0-M1) -
Please note that this release was made prior to entering the Apache Incubator,
and therefore it is not endorsed by Apache.

## Server install
Follow this [guide]({{ site.url }}/documentation/install-on-server.html) to install Brooklyn on a production server.
Follow this [guide]({{ site.path.website }}/documentation/install-on-server.html) to install Brooklyn on a production server.
@@ -13,7 +13,7 @@ There is a simple bash script available to help with the installation process.
#### Script prerequisites
The script assumes that the server is a recent *RHEL/CentOS 6.x Linux* or *Ubuntu 12.04* installation, but other Linux variants have been tested successfully.

The script will install Java 7 and other required packages if they are not present. You must have root access over [passwordless SSH]({{ site.url }}/documentation/passwordless-ssh.html) to install brooklyn, but the service runs as an ordinary user once installed.
The script will install Java 7 and other required packages if they are not present. You must have root access over [passwordless SSH]({{ site.path.website }}/documentation/passwordless-ssh.html) to install brooklyn, but the service runs as an ordinary user once installed.

To manage the brooklyn service you must also be able to connect to port 8081 remotely.

@@ -37,15 +37,15 @@ $ ./brooklyn-install.sh -s -r <your-server-ip>
Before installing Apache Brooklyn, you will need to configure the host as follows.

* install Java JRE or SDK (version 6 or later)
* install [SSH key]({{ site.url }}/documentation//ssh-key.html), if not available.
* enable [passwordless ssh login]({{ site.url }}/documentation/passwordless-ssh.html).
* install [SSH key]({{ site.path.website }}/documentation//ssh-key.html), if not available.
* enable [passwordless ssh login]({{ site.path.website }}/documentation/passwordless-ssh.html).
* create a `~/.brooklyn` directory on the host with `$ mkdir ~/.brooklyn`
* Check your iptables service, and if enabled, make sure that it accepts all incoming connections to 8443+ ports.
* [optional] Increase [linux kernel entropy]({{ site.url }}/documentation//increase-entropy.html) for faster ssh connections.
* [optional] Increase [linux kernel entropy]({{ site.path.website }}/documentation//increase-entropy.html) for faster ssh connections.

## <a id="download"></a>Download Brooklyn

Download the [Brooklyn distribution]({{ site.data.brooklyn.url.dist.tgz }}) and expand it to your home directory ( `~/` ), or in a location of your choice. Other [download options]({{site.url}}/download.html) are available.
Download the [Brooklyn distribution]({{ site.data.brooklyn.url.dist.tgz }}) and expand it to your home directory ( `~/` ), or in a location of your choice. Other [download options]({{site.path.website}}/download.html) are available.

{% if brooklyn_version contains 'SNAPSHOT' %}
Expand the `tar.gz` archive (note: as this is a -SNAPSHOT version, your filename will be slightly different):
@@ -86,7 +86,7 @@ Create a `.brooklyn` folder in your home directory and download the template [br

{% highlight bash %}
$ mkdir -p ~/.brooklyn
$ wget -O ~/.brooklyn/brooklyn.properties {{site.url}}/quickstart/brooklyn.properties
$ wget -O ~/.brooklyn/brooklyn.properties {{site.url_root}}{{site.path.website}}/quickstart/brooklyn.properties
$ chmod 600 ~/.brooklyn/brooklyn.properties
{% endhighlight %}

@@ -97,7 +97,7 @@ By default Brooklyn loads the catalog of available application components and se
`~/.brooklyn/catalog.xml`.

{% highlight bash %}
$ wget -O ~/.brooklyn/catalog.xml {{site.url}}/quickstart/catalog.xml
$ wget -O ~/.brooklyn/catalog.xml {{site.url_root}}{{site.path.website}}/quickstart/catalog.xml
{% endhighlight %}

The `catalog.xml` is the application blueprint catalog. The above example file contains some blueprints which will be automatically downloaded from the web if you run them.
@@ -35,7 +35,7 @@ relationships), along with policies for runtime management. The blueprint can
be described in [YAML][].

###### See also
* [Documentation]({{site.url}}/learnmore/catalog/index.html) for the entity,
* [Documentation]({{site.path.website}}/learnmore/catalog/index.html) for the entity,
policy and enricher blueprints that Apache Brooklyn supports out-of-the-box.


@@ -58,7 +58,7 @@ useful.

## Install Brooklyn

Download the [Brooklyn distribution]({{ site.data.brooklyn.url.dist.tgz }}) and expand it to your home directory ( `~/` ), or in a location of your choice. (Other [download options]({{site.url}}/download.html) are available.)
Download the [Brooklyn distribution]({{ site.data.brooklyn.url.dist.tgz }}) and expand it to your home directory ( `~/` ), or in a location of your choice. (Other [download options]({{site.path.website}}/download.html) are available.)

{% if brooklyn_version contains 'SNAPSHOT' %}
Expand the `tar.gz` archive (note: as this is a -SNAPSHOT version, your filename will be slightly different):
@@ -122,7 +122,7 @@ Create a `.brooklyn` folder in your home directory and download the template [br
{% highlight bash %}
$ mkdir ~/.brooklyn
$ cd ~/.brooklyn
$ wget {{site.url}}/quickstart/brooklyn.properties
$ wget {{site.url_root}}{{site.path.website}}/quickstart/brooklyn.properties
{% endhighlight %}

Open brooklyn.properties in a text editor and add your cloud credentials.

0 comments on commit b4ee7ff

Please sign in to comment.