refs #11787 - fix repo url's

Katello · Oct 21, 2015 · b71893d · b71893d
1 parent 10174cb
commit b71893d
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 15 deletions.
diff --git a/_config.yml b/_config.yml
@@ -1,9 +1,11 @@
 name: Katello
-baseurl: 
+baseurl:
 markdown: KramdownPygments
 highlighter: pygments
 latest: 2.3
 
+foreman_version: nightly
+
 version_aliases:
   '2.4': 2.4-RC
 

diff --git a/docs/cli/index.md b/docs/cli/index.md
@@ -37,7 +37,7 @@ yum-config-manager --enable rhel-6-server-optional-rpms
 <div id="el6" markdown="1">
 ```bash
 yum -y localinstall http://fedorapeople.org/groups/katello/releases/yum/{{ site.version }}/katello/RHEL/6Server/x86_64/katello-repos-latest.rpm
-yum -y localinstall http://yum.theforeman.org/{{ site.version }}/el6/x86_64/foreman-release.rpm
+yum -y localinstall http://yum.theforeman.org/{{ site.foreman_version }}/el6/x86_64/foreman-release.rpm
 yum -y localinstall http://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm
 ```
 </div>
@@ -55,7 +55,7 @@ yum-config-manager --enable rhel-7-server-extras-rpms
 <div id="el7" style="display: none;" markdown="1">
 ```bash
 yum -y localinstall http://fedorapeople.org/groups/katello/releases/yum/{{ site.version }}/katello/RHEL/7Server/x86_64/katello-repos-latest.rpm
-yum -y localinstall http://yum.theforeman.org/{{ site.version }}/el7/x86_64/foreman-release.rpm
+yum -y localinstall http://yum.theforeman.org/{{ site.foreman_version }}/el7/x86_64/foreman-release.rpm
 yum -y localinstall http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
 ```
 </div>

diff --git a/docs/installation/index.md b/docs/installation/index.md
@@ -91,8 +91,8 @@ yum-config-manager --enable rhel-6-server-optional-rpms
 
 <div id="el6" markdown="1">
 ```bash
-yum -y localinstall http://fedorapeople.org/groups/katello/releases/yum/nightly/katello/RHEL/6Server/x86_64/katello-repos-latest.rpm
-yum -y localinstall http://yum.theforeman.org/nightly/el6/x86_64/foreman-release.rpm
+yum -y localinstall http://fedorapeople.org/groups/katello/releases/yum/{{ site.version }}/katello/RHEL/6Server/x86_64/katello-repos-latest.rpm
+yum -y localinstall http://yum.theforeman.org/{{ site.foreman_version }}/el6/x86_64/foreman-release.rpm
 yum -y localinstall http://yum.puppetlabs.com/puppetlabs-release-el-6.noarch.rpm
 yum -y localinstall http://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm
 yum -y install foreman-release-scl
@@ -111,8 +111,8 @@ yum-config-manager --enable rhel-7-server-extras-rpms
 
 <div id="el7" style="display: none;" markdown="1">
 ```bash
-yum -y localinstall http://fedorapeople.org/groups/katello/releases/yum/nightly/katello/RHEL/7Server/x86_64/katello-repos-latest.rpm
-yum -y localinstall http://yum.theforeman.org/nightly/el7/x86_64/foreman-release.rpm
+yum -y localinstall http://fedorapeople.org/groups/katello/releases/yum/{{ site.version }}/katello/RHEL/7Server/x86_64/katello-repos-latest.rpm
+yum -y localinstall http://yum.theforeman.org/{{ site.foreman_verison }}/el7/x86_64/foreman-release.rpm
 yum -y localinstall http://yum.puppetlabs.com/puppetlabs-release-el-7.noarch.rpm
 yum -y localinstall http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
 yum -y install foreman-release-scl

diff --git a/docs/upgrade/capsule.md b/docs/upgrade/capsule.md
@@ -25,15 +25,15 @@ Update the Foreman and Katello release packages:
   * RHEL6 / CentOS 6:
 
 ```
-  # yum update -y http://fedorapeople.org/groups/katello/releases/yum/nightly/katello/RHEL/6Server/x86_64/katello-repos-latest.rpm
-  # yum update -y http://yum.theforeman.org/nightly/el6/x86_64/foreman-release.rpm
+  # yum update -y http://fedorapeople.org/groups/katello/releases/yum/{{ site.version }}/katello/RHEL/6Server/x86_64/katello-repos-latest.rpm
+  # yum update -y http://yum.theforeman.org/{{ site.foreman_version }}/el6/x86_64/foreman-release.rpm
 ```
 
   * RHEL7 / CentOS 7:
 
 ```
-  # yum update -y http://fedorapeople.org/groups/katello/releases/yum/nightly/katello/RHEL/7Server/x86_64/katello-repos-latest.rpm
-  # yum update -y http://yum.theforeman.org/nightly/el7/x86_64/foreman-release.rpm
+  # yum update -y http://fedorapeople.org/groups/katello/releases/yum/{{ site.version }}/katello/RHEL/7Server/x86_64/katello-repos-latest.rpm
+  # yum update -y http://yum.theforeman.org/{{ site.foreman_version }}/el7/x86_64/foreman-release.rpm
 ```
 
 ## Step 3 - Update Packages

diff --git a/docs/upgrade/index.md b/docs/upgrade/index.md
@@ -29,15 +29,15 @@ Update the Foreman and Katello release packages:
   * RHEL6 / CentOS 6:
 
 ```
-  # yum update -y http://fedorapeople.org/groups/katello/releases/yum/nightly/katello/RHEL/6Server/x86_64/katello-repos-latest.rpm
-  # yum update -y http://yum.theforeman.org/nightly/el6/x86_64/foreman-release.rpm
+  # yum update -y http://fedorapeople.org/groups/katello/releases/yum/{{ site.version }}/katello/RHEL/6Server/x86_64/katello-repos-latest.rpm
+  # yum update -y http://yum.theforeman.org/{{ site.foreman_version }}/el6/x86_64/foreman-release.rpm
 ```
 
   * RHEL7 / CentOS 7:
 
 ```
-  # yum update -y http://fedorapeople.org/groups/katello/releases/yum/nightly/katello/RHEL/7Server/x86_64/katello-repos-latest.rpm
-  # yum update -y http://yum.theforeman.org/nightly/el7/x86_64/foreman-release.rpm
+  # yum update -y http://fedorapeople.org/groups/katello/releases/yum/{{ site.version }}/katello/RHEL/7Server/x86_64/katello-repos-latest.rpm
+  # yum update -y http://yum.theforeman.org/{{ site.foreman_version }}/el7/x86_64/foreman-release.rpm
 ```
 
 ## Step 4 - Update Packages