webbuild*.cgi: use public buildvm* address instead of vpn

This commit is contained in:
Silvan Calarco 2015-07-11 19:19:29 +02:00
parent 602f6c8e9c
commit 7efe291816
4 changed files with 10 additions and 5 deletions

View File

@ -1,5 +1,5 @@
#!/bin/bash
WEBBUILD_HOST=buildvm01
WEBBUILD_HOST=buildvm01.openmamba.org
if [ "$QUERY_STRING" ]; then
# get (download, preserve content-type and content-disposition headrs)
contentdisposition=`curl -4 --connect-timeout 20 -sI "http://$WEBBUILD_HOST/cgi-bin/webbuild?$QUERY_STRING" -H "Content-Type: $CONTENT_TYPE" | grep Content-Disposition`

View File

@ -1,5 +1,5 @@
#!/bin/bash
WEBBUILD_HOST=buildvm02
WEBBUILD_HOST=buildvm02.openmamba.org
if [ "$QUERY_STRING" ]; then
# get (download, preserve content-type and content-disposition headrs)
contentdisposition=`curl -4 --connect-timeout 20 -sI "http://$WEBBUILD_HOST/cgi-bin/webbuild?$QUERY_STRING" -H "Content-Type: $CONTENT_TYPE" | grep Content-Disposition`

View File

@ -1,5 +1,5 @@
#!/bin/bash
WEBBUILD_HOST=webbuild-arm
WEBBUILD_HOST=webbuild-arm.openmamba.org
if [ "$QUERY_STRING" ]; then
# get (download, preserve content-type and content-disposition headrs)
contentdisposition=`curl -4 --connect-timeout 40 -sI "http://$WEBBUILD_HOST/cgi-bin/webbuild?$QUERY_STRING" -H "Content-Type: $CONTENT_TYPE" | grep Content-Disposition`

View File

@ -45,9 +45,14 @@ function openmamba_download_link($milestone, $medium, $currarch, $ext, $mlword,
}
$currreleasetag=$releaseTag[$medium.'-'.$milestone.'-'.$lang.'-'.$currarch];
$ret = '';
if ($lang != "it") {
$downloadmirror = 'http://www2.openmamba.org/pub/openmamba/media';
} else {
$downloadmirror = '/media';
}
if ("$currreleasetag" != "") {
$ret .= "<table style='border:0;margin:0;margin-bottom:5px;'><tr><td style='vertical-align:middle;padding:4px;border:0;margin:0;width:20px;align:center;'><img src=/wp-content/themes/openmamba/download.png /></td>";
$ret .= "<td style='border:0;margin:0;padding:4px;'><h5 style='margin:1px;'><a href=\"/media/$milestone/$medium/$lang/".
$ret .= "<td style='border:0;margin:0;padding:4px;'><h5 style='margin:1px;'><a href=\"" . $downloadmirror. "/$milestone/$medium/$lang/".
$nameMedium[$medium.'-'.$currreleasetag.'-'.$lang.'-'.$currarch]."\">";
$ret .= "openmamba $displaymilestone $medium ";
$ret .= __('for','responsive')." $currarch ($mlword)</a>&nbsp;</h5>";
@ -172,7 +177,7 @@ function openmamba_webbuild_func( $atts ) {
}
$a = shortcode_atts( array(
'host' => 'buildvm01'
'host' => 'buildvm01.openmamba.org'
), $atts );
print '<script>host="' . $a['host'] . '"</script>';