brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rich...@apache.org
Subject [17/50] [abbrv] incubator-brooklyn-site git commit: replace site.url with site.path.website
Date Wed, 17 Dec 2014 17:53:54 GMT
replace site.url with site.path.website


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/commit/b4ee7ffe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/tree/b4ee7ffe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/diff/b4ee7ffe

Branch: refs/heads/master
Commit: b4ee7ffeaf6fa03003b32561133b05d12a5a74e7
Parents: 96afcc7
Author: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Authored: Mon Dec 15 12:49:26 2014 +0000
Committer: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Committed: Mon Dec 15 16:49:54 2014 +0000

----------------------------------------------------------------------
 _config.yml                        |  3 ++-
 _layouts/website-base.html         | 14 +++++++-------
 _layouts/website-normal.html       |  4 ++--
 _plugins/dependency_url.rb         |  4 ++--
 documentation.md                   |  4 ++--
 documentation/install-on-server.md | 14 +++++++-------
 glossary.md                        |  2 +-
 quickstart/index.md                |  4 ++--
 8 files changed, 25 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/blob/b4ee7ffe/_config.yml
----------------------------------------------------------------------
diff --git a/_config.yml b/_config.yml
index 146f2bc..c21cc23 100644
--- a/_config.yml
+++ b/_config.yml
@@ -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

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/blob/b4ee7ffe/_layouts/website-base.html
----------------------------------------------------------------------
diff --git a/_layouts/website-base.html b/_layouts/website-base.html
index dd31cd9..977161b 100644
--- a/_layouts/website-base.html
+++ b/_layouts/website-base.html
@@ -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>

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/blob/b4ee7ffe/_layouts/website-normal.html
----------------------------------------------------------------------
diff --git a/_layouts/website-normal.html b/_layouts/website-normal.html
index 35d72c5..774709a 100644
--- a/_layouts/website-normal.html
+++ b/_layouts/website-normal.html
@@ -11,9 +11,9 @@ layout: website-base
         <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 %}

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/blob/b4ee7ffe/_plugins/dependency_url.rb
----------------------------------------------------------------------
diff --git a/_plugins/dependency_url.rb b/_plugins/dependency_url.rb
index 61fbca9..8a72e17 100644
--- a/_plugins/dependency_url.rb
+++ b/_plugins/dependency_url.rb
@@ -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 @@ module JekyllDependencyUrl
           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

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/blob/b4ee7ffe/documentation.md
----------------------------------------------------------------------
diff --git a/documentation.md b/documentation.md
index f75b288..403f0f1 100644
--- a/documentation.md
+++ b/documentation.md
@@ -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.

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/blob/b4ee7ffe/documentation/install-on-server.md
----------------------------------------------------------------------
diff --git a/documentation/install-on-server.md b/documentation/install-on-server.md
index 742fd7c..f658c73 100644
--- a/documentation/install-on-server.md
+++ b/documentation/install-on-server.md
@@ -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.

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/blob/b4ee7ffe/glossary.md
----------------------------------------------------------------------
diff --git a/glossary.md b/glossary.md
index a53255d..0651068 100644
--- a/glossary.md
+++ b/glossary.md
@@ -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.
 
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/blob/b4ee7ffe/quickstart/index.md
----------------------------------------------------------------------
diff --git a/quickstart/index.md b/quickstart/index.md
index cade0aa..418d4f4 100644
--- a/quickstart/index.md
+++ b/quickstart/index.md
@@ -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.


Mime
View raw message