diff --git a/templates/downloads/js/yum.js b/templates/downloads/js/yum.js index 74b5702..eec3dc3 100644 --- a/templates/downloads/js/yum.js +++ b/templates/downloads/js/yum.js @@ -121,6 +121,9 @@ function archChanged() { var arch = document.getElementById('arch').value; if (!plat || plat == -1) { + document.getElementById('script').innerHTML = 'Select version and platform above'; + + // TODO: Remove document.getElementById('reporpm').innerHTML = 'Select version and platform above'; document.getElementById('clientpackage').innerHTML = 'Select version and platform above'; document.getElementById('serverpackage').innerHTML = 'Select version and platform above'; @@ -135,21 +138,30 @@ function archChanged() { var url = 'https://download.postgresql.org/pub/repos/yum/reporpms/' + plat + '-' + arch + '/pgdg-' + get_rpm_prefix(plat) +'-repo-latest.noarch.rpm'; var installer = get_installer(plat); - document.getElementById('reporpm').innerHTML = installer + ' install ' + url; - document.getElementById('clientpackage').innerHTML = installer + ' install postgresql' + shortver; - document.getElementById('serverpackage').innerHTML = installer + ' install postgresql' + shortver + '-server'; + script = document.getElementById('script') + script.innerHTML = '# Install the repository RPM:
'; + script.innerHTML += installer + ' install ' + url + '

'; + + script.innerHTML += '# Install client tools:
'; + script.innerHTML += installer + ' install postgresql' + shortver + '

'; - document.getElementById('dnfmodule').style.display = disable_module_on(plat) ? 'list-item' : 'none'; + script.innerHTML += '# Optionally install the database server:
'; + script.innerHTML += installer + ' install postgresql' + shortver + '-server

'; + if (disable_module_on(plat)) { + script.innerHTML += '# Disable the built-in PostgreSQL module:
'; + script.innerHTML += 'dnf -qy module disable postgresql

'; + } + + script.innerHTML += '# Optionally initialize the database and enable automatic start:
'; if (uses_systemd(plat)) { var setupcmd = 'postgresql-' + shortver + '-setup'; if (ver < 10) { - setupcmd = 'postgresql' + shortver + '-setup'; + setupcmd = 'postgresql' + shortver + '-setup'; } - - document.getElementById('initdb').innerHTML = '/usr/pgsql-' + ver + '/bin/' + setupcmd + ' initdb
systemctl enable postgresql-' + ver + '
systemctl start postgresql-' + ver; + script.innerHTML += '/usr/pgsql-' + ver + '/bin/' + setupcmd + ' initdb
systemctl enable postgresql-' + ver + '
systemctl start postgresql-' + ver; } else { - document.getElementById('initdb').innerHTML = 'service postgresql-' + ver + ' initdb
chkconfig postgresql-' + ver + ' on
service postgresql-' + ver + ' start'; + script.innerHTML += 'service postgresql-' + ver + ' initdb
chkconfig postgresql-' + ver + ' on
service postgresql-' + ver + ' start'; } } diff --git a/templates/pages/download/linux/redhat.html b/templates/pages/download/linux/redhat.html index bc309d6..8ca2320 100644 --- a/templates/pages/download/linux/redhat.html +++ b/templates/pages/download/linux/redhat.html @@ -59,20 +59,8 @@ To use the PostgreSQL Yum Repository, follow these steps:
  • Select version:
  • Select platform:
  • Select architecture:
  • -
  • Install the repository RPM: -
    
    -  
  • -
  • Disable the built-in PostgreSQL module -
    dnf -qy module disable postgresql
    -
  • -
  • Install the client packages: -
    
    -  
  • -
  • Optionally install the server packages: -
    
    -  
  • -
  • Optionally initialize the database and enable automatic start: -
    
    +  
  • Copy, paste and run the setup script: +