[Astlinux-commits] SF.net SVN: astlinux:[7727] branches/1.0

[<abe...@us...>]

Revision: 7727
          http://sourceforge.net/p/astlinux/code/7727
Author:   abelbeck
Date:     2016-06-19 22:35:06 +0000 (Sun, 19 Jun 2016)
Log Message:
-----------
Rename S3 related URL's from astlinux.org to astlinux-project.org, and S3 buckets from astlinuxfiles,astlinuxmirror to files.astlinux-project,mirror.astlinux-project

Modified Paths:
--------------
    branches/1.0/crosstool-ng-src/get-files.sh
    branches/1.0/project/astlinux/target_skeleton/usr/sbin/download-file
    branches/1.0/project/astlinux/target_skeleton/usr/sbin/set-locale
    branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-RUNNIX-image
    branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package
    branches/1.0/scripts/gen-locale
    branches/1.0/scripts/master-locales
    branches/1.0/scripts/master-runnix-upload
    branches/1.0/scripts/master-sounds
    branches/1.0/scripts/master-upload
    branches/1.0/scripts/upload-dl-pair
    branches/1.0/scripts/upload_script.sh
    branches/1.0/toolchain/getter_script.sh

Modified: branches/1.0/crosstool-ng-src/get-files.sh
===================================================================
--- branches/1.0/crosstool-ng-src/get-files.sh	2016-06-17 15:56:00 UTC (rev 7726)
+++ branches/1.0/crosstool-ng-src/get-files.sh	2016-06-19 22:35:06 UTC (rev 7727)
@@ -1,7 +1,6 @@
 # shell script to add additional files
 
-#FILES_URL="http://files.astlinux.org"
-FILES_URL="http://d18y2f4fr43xzs.cloudfront.net"
+FILES_URL="http://files.astlinux-project.org"
 
 TARBALLS=".build/tarballs"
 

Modified: branches/1.0/project/astlinux/target_skeleton/usr/sbin/download-file
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/usr/sbin/download-file	2016-06-17 15:56:00 UTC (rev 7726)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/download-file	2016-06-19 22:35:06 UTC (rev 7727)
@@ -41,7 +41,7 @@
 
 ## Redirect AstLinux mirror URL to HTTPS
 ##
-redirect_url_to_https "mirror.astlinux.org"
+redirect_url_to_https "mirror.astlinux-project.org"
 
 curl -sSfL --globoff --retry 1 --connect-timeout 15 --max-time 1800 -o "$file" "$url" >/dev/null
 

Modified: branches/1.0/project/astlinux/target_skeleton/usr/sbin/set-locale
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/usr/sbin/set-locale	2016-06-17 15:56:00 UTC (rev 7726)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/set-locale	2016-06-19 22:35:06 UTC (rev 7727)
@@ -7,7 +7,7 @@
 GREEN=0
 #
 # locale repository
-SRC_URL="https://mirror.astlinux.org/locale"
+SRC_URL="https://mirror.astlinux-project.org/locale"
 #
 # base locale directory
 BASE="/usr/lib/locale"

Modified: branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-RUNNIX-image
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-RUNNIX-image	2016-06-17 15:56:00 UTC (rev 7726)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-RUNNIX-image	2016-06-19 22:35:06 UTC (rev 7727)
@@ -7,7 +7,7 @@
 GREEN=0
 #
 # Default RUNNIX Repository
-SRC_URL="https://mirror.astlinux.org/runnix4"
+SRC_URL="https://mirror.astlinux-project.org/runnix4"
 #
 # Default RUNNIX Version (use if no local 'ver' file)
 RUN_VER="runnix-0.2.1"

Modified: branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package	2016-06-17 15:56:00 UTC (rev 7726)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package	2016-06-19 22:35:06 UTC (rev 7727)
@@ -248,7 +248,7 @@
   if ! RAM_needed_MB 475; then
     finish $RED "Not enough RAM installed. Minimum: 512 MB, Recommended: 1024+ MB"
   fi
-  SRC_URL="http://files.astlinux.org/fop2-2.28-debian-$(uname -m | sed -e 's/i.86/i386/').tgz"
+  SRC_URL="https://files.astlinux-project.org/fop2-2.28-debian-$(uname -m | sed -e 's/i.86/i386/').tgz"
   ;;
 
 show)

Modified: branches/1.0/scripts/gen-locale
===================================================================
--- branches/1.0/scripts/gen-locale	2016-06-17 15:56:00 UTC (rev 7726)
+++ branches/1.0/scripts/gen-locale	2016-06-19 22:35:06 UTC (rev 7727)
@@ -33,7 +33,7 @@
     echo "gen-locale: Skipping '$i', only UTF-8 is supported." >&2
     continue
   fi
-  localedef --prefix "$TMP_DIR" --little-endian -c -i ${lang} -f UTF-8 ${lang}.UTF-8
+  localedef --prefix "$TMP_DIR" -c -i ${lang} -f UTF-8 ${lang}.UTF-8
   if [ $? -eq 0 ]; then
     VALID="$VALID${VALID:+, }${lang}.UTF-8"
   fi

Modified: branches/1.0/scripts/master-locales
===================================================================
--- branches/1.0/scripts/master-locales	2016-06-17 15:56:00 UTC (rev 7726)
+++ branches/1.0/scripts/master-locales	2016-06-19 22:35:06 UTC (rev 7727)
@@ -80,6 +80,8 @@
 vi_VN
 "
 
+S3_BUCKET="mirror.astlinux-project"
+
 TMP_LIST_FILE="/tmp/master-locale-list"
 LOCALE_FILE="$(pwd)/locale-archive"
 
@@ -98,13 +100,13 @@
     sha1sum locale-archive.gz > locale-archive.gz.sha1
     for file in locale-archive.gz locale-archive.gz.sha1; do
     if [ "$ACTION" = "upload" ]; then
-      s3cmd put --acl-public "$file" "s3://astlinuxmirror/locale/${locale}/${file}"
+      s3cmd put --acl-public "$file" "s3://${S3_BUCKET}/locale/${locale}/${file}"
       if [ $? -ne 0 ]; then
         rm -f "$TMP_LIST_FILE" "$LOCALE_FILE.gz" "$LOCALE_FILE.gz.sha1"
         exit 1
       fi
     else
-      echo "s3cmd put --acl-public $file s3://astlinuxmirror/locale/${locale}/${file}"
+      echo "s3cmd put --acl-public $file s3://${S3_BUCKET}/locale/${locale}/${file}"
     fi
     done
   else
@@ -114,13 +116,13 @@
 
 file="$TMP_LIST_FILE"
 if [ "$ACTION" = "upload" ]; then
-  s3cmd put --acl-public "$file" "s3://astlinuxmirror/locale/locales.txt"
+  s3cmd put --acl-public "$file" "s3://${S3_BUCKET}/locale/locales.txt"
   if [ $? -ne 0 ]; then
     rm -f "$TMP_LIST_FILE" "$LOCALE_FILE" "$LOCALE_FILE.gz" "$LOCALE_FILE.gz.sha1"
     exit 1
   fi
 else
-  echo "s3cmd put --acl-public $file s3://astlinuxmirror/locale/locales.txt"
+  echo "s3cmd put --acl-public $file s3://${S3_BUCKET}/locale/locales.txt"
 fi
 
 if [ $err_cnt -gt 0 ]; then

Modified: branches/1.0/scripts/master-runnix-upload
===================================================================
--- branches/1.0/scripts/master-runnix-upload	2016-06-17 15:56:00 UTC (rev 7726)
+++ branches/1.0/scripts/master-runnix-upload	2016-06-19 22:35:06 UTC (rev 7727)
@@ -20,7 +20,7 @@
 echo "$runnix" > /tmp/ver
 
 for file in $runnix.tar.gz $runnix.tar.gz.sha1 /tmp/ver; do
-  s3cmd put --acl-public "$file" "s3://astlinuxmirror/runnix4/${file##*/}"
+  s3cmd put --acl-public "$file" "s3://mirror.astlinux-project/runnix4/${file##*/}"
 done
 
 rm /tmp/ver

Modified: branches/1.0/scripts/master-sounds
===================================================================
--- branches/1.0/scripts/master-sounds	2016-06-17 15:56:00 UTC (rev 7726)
+++ branches/1.0/scripts/master-sounds	2016-06-19 22:35:06 UTC (rev 7727)
@@ -86,6 +86,8 @@
 asterisk-moh-opsound-wav
 "
 
+S3_BUCKET="mirror.astlinux-project"
+
 SOUNDS_URL="http://downloads.asterisk.org/pub/telephony/sounds"
 
 SUFFIX="current.tar.gz"
@@ -120,19 +122,19 @@
   download_sound $i
   if [ $? -eq 0 ]; then
     if [ "$ACTION" = "upload" ]; then
-      s3cmd put --acl-public "$TMP_SND_FILE" "s3://astlinuxmirror/asterisk-sounds/${i}-${SUFFIX}"
+      s3cmd put --acl-public "$TMP_SND_FILE" "s3://${S3_BUCKET}/asterisk-sounds/${i}-${SUFFIX}"
       if [ $? -ne 0 ]; then
         cleanup
         exit 1
       fi
-      s3cmd put --acl-public "$TMP_SND_FILE.sha1" "s3://astlinuxmirror/asterisk-sounds/${i}-${SUFFIX}.sha1"
+      s3cmd put --acl-public "$TMP_SND_FILE.sha1" "s3://${S3_BUCKET}/asterisk-sounds/${i}-${SUFFIX}.sha1"
       if [ $? -ne 0 ]; then
         cleanup
         exit 1
       fi
     else
-      echo "s3cmd put --acl-public $TMP_SND_FILE s3://astlinuxmirror/asterisk-sounds/${i}-${SUFFIX}"
-      echo "s3cmd put --acl-public $TMP_SND_FILE.sha1 s3://astlinuxmirror/asterisk-sounds/${i}-${SUFFIX}.sha1"
+      echo "s3cmd put --acl-public $TMP_SND_FILE s3://${S3_BUCKET}/asterisk-sounds/${i}-${SUFFIX}"
+      echo "s3cmd put --acl-public $TMP_SND_FILE.sha1 s3://${S3_BUCKET}/asterisk-sounds/${i}-${SUFFIX}.sha1"
     fi
   else
     err_cnt=$((err_cnt+1))

Modified: branches/1.0/scripts/master-upload
===================================================================
--- branches/1.0/scripts/master-upload	2016-06-17 15:56:00 UTC (rev 7726)
+++ branches/1.0/scripts/master-upload	2016-06-19 22:35:06 UTC (rev 7727)
@@ -14,7 +14,7 @@
   local remote_dir="$1" files="$2" count="$3" IFS=' ' file
 
   for file in $files; do
-    s3cmd put --acl-public "$file" "s3://astlinuxmirror/$remote_dir/${file##*/}"
+    s3cmd put --acl-public "$file" "s3://mirror.astlinux-project/$remote_dir/${file##*/}"
   done
 
   if [ $? -eq 0 ]; then

Modified: branches/1.0/scripts/upload-dl-pair
===================================================================
--- branches/1.0/scripts/upload-dl-pair	2016-06-17 15:56:00 UTC (rev 7726)
+++ branches/1.0/scripts/upload-dl-pair	2016-06-19 22:35:06 UTC (rev 7727)
@@ -14,6 +14,6 @@
 sha1sum ${1} > ${1}.sha1
 
 for file in ${1} ${1}.sha1; do
-  s3cmd put --acl-public "$file" "s3://astlinuxfiles/${file##*/}"
+  s3cmd put --acl-public "$file" "s3://files.astlinux-project/${file##*/}"
 done
 

Modified: branches/1.0/scripts/upload_script.sh
===================================================================
--- branches/1.0/scripts/upload_script.sh	2016-06-17 15:56:00 UTC (rev 7726)
+++ branches/1.0/scripts/upload_script.sh	2016-06-19 22:35:06 UTC (rev 7727)
@@ -15,7 +15,7 @@
 done
 
 if [ "$action" = "all" ]; then
-  s3cmd sync --acl-public --exclude '*/*' -v dl/ s3://astlinuxfiles/
+  s3cmd sync --acl-public --exclude '*/*' -v dl/ s3://files.astlinux-project/
 elif [ "$action" = "dry-run" ]; then
-  s3cmd sync --dry-run --exclude '*/*' -v dl/ s3://astlinuxfiles/
+  s3cmd sync --dry-run --exclude '*/*' -v dl/ s3://files.astlinux-project/
 fi

Modified: branches/1.0/toolchain/getter_script.sh
===================================================================
--- branches/1.0/toolchain/getter_script.sh	2016-06-17 15:56:00 UTC (rev 7726)
+++ branches/1.0/toolchain/getter_script.sh	2016-06-19 22:35:06 UTC (rev 7727)
@@ -1,9 +1,8 @@
 #!/bin/bash
 # getter_better script from gumstix
 # what a great idea...
-#SITE="http://astlinuxfiles.s3.amazonaws.com"
-#SITE="files.astlinux.org"
-SITE="d18y2f4fr43xzs.cloudfront.net"
+#SITE="http://s3.amazonaws.com/files.astlinux-project"
+SITE="files.astlinux-project.org"
 
 WGET_ARGS="--passive-ftp --timeout=30 -c -t 2"
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.