Commit fc6625ec authored by Son Nguyen's avatar Son Nguyen

Using HTTPs to access mahara git repo on git.mahara.org

Change-Id: Ib3a6a4dd902884817aa34bfd1c8ab3a7557ffacc
parent 20483339
mahara-scripts (1.27) unstable; urgency=low
* Change mahara git repo protocol to HTTPs
-- Son Nguyen <son.nguyen@catalyst.net.nz> Mon, 24 Aug 2015 11:05:36 +1300
mahara-scripts (1.26) unstable; urgency=low mahara-scripts (1.26) unstable; urgency=low
* Fix the issue of deleting all data * Fix the issue of deleting all data
......
...@@ -57,7 +57,7 @@ case "$1" in ...@@ -57,7 +57,7 @@ case "$1" in
echo "DATA=/var/lib/mahara-langpacks" > /etc/mahara-langpacks.conf echo "DATA=/var/lib/mahara-langpacks" > /etc/mahara-langpacks.conf
echo "SCRIPTS=/usr/lib/mahara-langpacks" >> /etc/mahara-langpacks.conf echo "SCRIPTS=/usr/lib/mahara-langpacks" >> /etc/mahara-langpacks.conf
echo "DOCROOT=/var/www/mahara-langpacks" >> /etc/mahara-langpacks.conf echo "DOCROOT=/var/www/mahara-langpacks" >> /etc/mahara-langpacks.conf
echo "PROJDIR='git@git.mahara.org:mahara/mahara.git'" >> /etc/mahara-langpacks.conf echo "PROJDIR='https://git.mahara.org/mahara/mahara.git'" >> /etc/mahara-langpacks.conf
DOMAINNAME="langpacks.mahara.org" DOMAINNAME="langpacks.mahara.org"
echo "WWWROOT='http://${DOMAINNAME}'" >> /etc/mahara-langpacks.conf echo "WWWROOT='http://${DOMAINNAME}'" >> /etc/mahara-langpacks.conf
......
...@@ -40,7 +40,7 @@ my $CLEAN = "${DATA}/new"; ...@@ -40,7 +40,7 @@ my $CLEAN = "${DATA}/new";
my $TARBALLS = "${DATA}/tarballs"; my $TARBALLS = "${DATA}/tarballs";
my $MAHARA = "${DATA}/mahara"; my $MAHARA = "${DATA}/mahara";
my $MAHARAREMOTE = 'git@git.mahara.org:mahara/mahara.git'; my $MAHARAREMOTE = 'https://git.mahara.org/mahara/mahara.git';
my $REPOLIST = 'https://git.mahara.org/scripts/mahara-scripts/blob/master/mahara-langpacks/language-repos.txt'; my $REPOLIST = 'https://git.mahara.org/scripts/mahara-scripts/blob/master/mahara-langpacks/language-repos.txt';
mkpath $GITDIR; mkpath $GITDIR;
...@@ -125,7 +125,7 @@ foreach my $branch (@branches) { ...@@ -125,7 +125,7 @@ foreach my $branch (@branches) {
foreach my $lang (@langkeys) { foreach my $lang (@langkeys) {
if ( ! defined $last->{$lang} ) { if ( ! defined $last->{$lang} ) {
$last->{$lang} = { repo => "git@git.mahara.org:lang-old/$lang.git" }; $last->{$lang} = { repo => "https://git.mahara.org/lang-old/$lang.git" };
} }
if ( defined $langs{$lang}->{repo} ) { if ( defined $langs{$lang}->{repo} ) {
...@@ -146,7 +146,7 @@ foreach my $lang (@langkeys) { ...@@ -146,7 +146,7 @@ foreach my $lang (@langkeys) {
$repotype = 'launchpad'; $repotype = 'launchpad';
@branches = qw(1.7_STABLE 1.8_STABLE 1.9_STABLE 1.10_STABLE 15.04_STABLE master); @branches = qw(1.7_STABLE 1.8_STABLE 1.9_STABLE 1.10_STABLE 15.04_STABLE master);
} }
elsif ( $remote =~ m{^git@git\.nzoss\.org\.nz} ) { elsif ( $remote =~ m{^https://git\.mahara\.org} ) {
$repotype = 'git'; $repotype = 'git';
! -d "$gitlangdir" && system "git clone --quiet $remote $gitlangdir"; ! -d "$gitlangdir" && system "git clone --quiet $remote $gitlangdir";
chdir $gitlangdir; chdir $gitlangdir;
......
ar lp:mahara-lang ar lp:mahara-lang
ca lp:mahara-lang ca lp:mahara-lang
#cs git@git.mahara.org:lang-old/cs.git #cs git@git.mahara.org:lang-old/cs.git
cs git@gitlab.com:umim-to/mahara-cs-test.git cs https://gitlab.com/umim-to/mahara-cs-test.git
da lp:mahara-lang da lp:mahara-lang
de lp:mahara-lang de lp:mahara-lang
de_du lp:mahara-lang de_du lp:mahara-lang
el lp:mahara-lang el lp:mahara-lang
en_GB lp:mahara-lang en_GB lp:mahara-lang
en_us git@git.mahara.org:lang-old/en_us.git en_us https://git.mahara.org/lang-old/en_us.git
es lp:mahara-lang es lp:mahara-lang
eu lp:mahara-lang eu lp:mahara-lang
fi lp:mahara-lang fi lp:mahara-lang
......
...@@ -22,14 +22,15 @@ PHPSCRIPT=${HOME}/mahara-scripts/mahara-langpacks/php-po.php ...@@ -22,14 +22,15 @@ PHPSCRIPT=${HOME}/mahara-scripts/mahara-langpacks/php-po.php
[ ! -d ${GITDIR} ] && mkdir ${GITDIR} [ ! -d ${GITDIR} ] && mkdir ${GITDIR}
[ ! -d ${OUT} ] && mkdir ${OUT} [ ! -d ${OUT} ] && mkdir ${OUT}
mahararemote='git@github.com:MaharaProject/mahara.git' #mahararemote='git@github.com:MaharaProject/mahara.git'
mahararemote='https://git.mahara.org/mahara/mahara.git'
if [ ! -d ${MAHARA} ] ; then if [ ! -d ${MAHARA} ] ; then
cd ${WORK} cd ${WORK}
git clone ${mahararemote} ${MAHARA} git clone ${mahararemote} ${MAHARA}
fi fi
langremotebase='git@git.mahara.org:lang-old/' langremotebase='https://git.mahara.org/lang-old/'
langs="ca cs da de en_us es eu fi fr he it ja ko nl no_nb sl zh_tw" langs="ca cs da de en_us es eu fi fr he it ja ko nl no_nb sl zh_tw"
for lang in ${langs} ; do for lang in ${langs} ; do
......
...@@ -32,7 +32,8 @@ TEMP=${WORK}/temp ...@@ -32,7 +32,8 @@ TEMP=${WORK}/temp
[ ! -d ${TEMP} ] && mkdir ${TEMP} [ ! -d ${TEMP} ] && mkdir ${TEMP}
[ ! -d ${DOCROOT}/pot ] && mkdir ${DOCROOT}/pot [ ! -d ${DOCROOT}/pot ] && mkdir ${DOCROOT}/pot
mahararemote='git@git.mahara.org/mahara/mahara.git' mahararemote='https://git.mahara.org/mahara/mahara.git'
#mahararemote='git@git.mahara.org/mahara/mahara.git'
#mahararemote='git@github.com:MaharaProject/mahara.git' #mahararemote='git@github.com:MaharaProject/mahara.git'
if [ ! -d ${GITDIR} ]; then if [ ! -d ${GITDIR} ]; then
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment