Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
configuration
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenEdx
configuration
Commits
05af145f
Commit
05af145f
authored
Feb 27, 2018
by
YSC
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更换github源为本地仓库
parent
82a3fb0e
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
29 additions
and
24 deletions
+29
-24
docker/build/trusty-common/Dockerfile
+3
-3
docker/build/xenial-common/Dockerfile
+3
-3
playbooks/roles/edx_ansible/defaults/main.yml
+1
-1
playbooks/roles/jenkins_worker/tasks/python_platform_worker.yml
+1
-1
playbooks/roles/test_build_server/tasks/main.yml
+1
-1
util/install/ansible-bootstrap.sh
+16
-11
util/jenkins/get-rc-branches.sh
+1
-1
util/vagrant/upgrade.sh
+2
-2
util/vpc-tools/abbey.py
+1
-1
No files found.
docker/build/trusty-common/Dockerfile
View file @
05af145f
FROM
ubuntu:trusty
MAINTAINER
edxops
ENV
ANSIBLE_REPO="https://git
hub.com/edx/ansible
"
ENV
CONFIGURATION_REPO="https://git
hub.com/e
dx/configuration.git"
ENV
CONFIGURATION_VERSION="master"
ENV
ANSIBLE_REPO="https://git
.orhontech.com/OpenEdx/ansible.git
"
ENV
CONFIGURATION_REPO="https://git
.orhontech.com/OpenE
dx/configuration.git"
ENV
CONFIGURATION_VERSION="
open-release-mongol/ginkgo.
master"
ADD
util/install/ansible-bootstrap.sh /tmp/ansible-bootstrap.sh
RUN
chmod +x /tmp/ansible-bootstrap.sh
...
...
docker/build/xenial-common/Dockerfile
View file @
05af145f
...
...
@@ -13,9 +13,9 @@ ENV LANG en_US.UTF-8
ENV
LANGUAGE en_US:en
ENV
LC_ALL en_US.UTF-8
ENV
ANSIBLE_REPO="https://git
hub.com/edx/ansible
"
ENV
CONFIGURATION_REPO="https://git
hub.com/e
dx/configuration.git"
ARG
OPENEDX_RELEASE=
master
ENV
ANSIBLE_REPO="https://git
.orhontech.com/OpenEdx/ansible.git
"
ENV
CONFIGURATION_REPO="https://git
.orhontech.com/OpenE
dx/configuration.git"
ARG
OPENEDX_RELEASE=
open-release-mongol/ginkgo.2
ENV
CONFIGURATION_VERSION="${OPENEDX_RELEASE}"
ADD
util/install/ansible-bootstrap.sh /tmp/ansible-bootstrap.sh
...
...
playbooks/roles/edx_ansible/defaults/main.yml
View file @
05af145f
...
...
@@ -40,7 +40,7 @@ edx_ansible_venvs_dir: "{{ edx_ansible_app_dir }}/venvs"
edx_ansible_venv_dir
:
"
{{
edx_ansible_venvs_dir
}}/edx_ansible"
edx_ansible_venv_bin
:
"
{{
edx_ansible_venv_dir
}}/bin"
edx_ansible_user
:
"
edx-ansible"
edx_ansible_source_repo
:
https://git
hub.com/e
dx/configuration.git
edx_ansible_source_repo
:
https://git
.orhontech.com/OpenE
dx/configuration.git
edx_ansible_requirements_file
:
"
{{
edx_ansible_code_dir
}}/requirements.txt"
edx_ansible_requirements_files
:
-
"
{{
edx_ansible_code_dir
}}/pre-requirements.txt"
...
...
playbooks/roles/jenkins_worker/tasks/python_platform_worker.yml
View file @
05af145f
...
...
@@ -7,7 +7,7 @@
# will truncate all history prior to the last revision.
-
name
:
Create shallow clone of edx-platform
git
:
repo
:
https://git
hub
.com/edx/edx-platform.git
repo
:
https://git
.orhontech
.com/edx/edx-platform.git
dest
:
"
{{
jenkins_home
}}/shallow-clone"
version
:
"
{{
jenkins_edx_platform_version
}}"
depth
:
1
...
...
playbooks/roles/test_build_server/tasks/main.yml
View file @
05af145f
...
...
@@ -22,7 +22,7 @@
-
name
:
Create clone of edx-platform
git
:
repo
:
"
https://git
hub
.com/edx/edx-platform.git"
repo
:
"
https://git
.orhontech
.com/edx/edx-platform.git"
dest
:
"
{{
test_build_server_repo_path
}}/edx-platform-clone"
version
:
"
{{
test_edx_platform_version
}}"
become_user
:
"
{{
test_build_server_user
}}"
...
...
util/install/ansible-bootstrap.sh
View file @
05af145f
...
...
@@ -14,7 +14,7 @@
set
-xe
if
[[
-z
"
${
ANSIBLE_REPO
}
"
]]
;
then
ANSIBLE_REPO
=
"https://git
hub.com/e
dx/ansible.git"
ANSIBLE_REPO
=
"https://git
.orhontech.com/OpenE
dx/ansible.git"
fi
if
[[
-z
"
${
ANSIBLE_VERSION
}
"
]]
;
then
...
...
@@ -22,11 +22,12 @@ if [[ -z "${ANSIBLE_VERSION}" ]]; then
fi
if
[[
-z
"
${
CONFIGURATION_REPO
}
"
]]
;
then
CONFIGURATION_REPO
=
"https://git
hub.com/e
dx/configuration.git"
CONFIGURATION_REPO
=
"https://git
.orhontech.com/OpenE
dx/configuration.git"
fi
if
[[
-z
"
${
CONFIGURATION_VERSION
}
"
]]
;
then
CONFIGURATION_VERSION
=
"master"
# CONFIGURATION_VERSION="open-release-mongol/ginkgo.master"
fi
if
[[
-z
"
${
UPGRADE_OS
}
"
]]
;
then
...
...
@@ -47,6 +48,7 @@ VIRTUAL_ENV="/tmp/bootstrap"
PYTHON_BIN
=
"
${
VIRTUAL_ENV
}
/bin"
ANSIBLE_DIR
=
"/tmp/ansible"
CONFIGURATION_DIR
=
"/tmp/configuration"
EDX_PPA
=
"deb http://ppa.edx.org precise main"
EDX_PPA_KEY_SERVER
=
"keyserver.ubuntu.com"
EDX_PPA_KEY_ID
=
"B41E5E3969464050"
...
...
@@ -69,7 +71,10 @@ if [[ $(id -u) -ne 0 ]] ;then
exit
1
;
fi
if
grep
-q
'Trusty Tahr'
/etc/os-release
if
grep
-q
'Precise Pangolin'
/etc/os-release
then
SHORT_DIST
=
"precise"
elif
grep
-q
'Trusty Tahr'
/etc/os-release
then
SHORT_DIST
=
"trusty"
elif
grep
-q
'Xenial Xerus'
/etc/os-release
...
...
@@ -78,7 +83,7 @@ then
else
cat
<<
EOF
This script is only known to work on Ubuntu Trusty and Xenial,
This script is only known to work on Ubuntu
Precise,
Trusty and Xenial,
exiting. If you are interested in helping make installation possible
on other platforms, let us know.
...
...
@@ -110,27 +115,27 @@ add-apt-repository -y "${EDX_PPA}"
# Install python 2.7 latest, git and other common requirements
# NOTE: This will install the latest version of python 2.7 and
# which may differ from what is pinned in virtualenvironments
apt-get update
-y
#
apt-get update -y
apt-get install
-y
python2.7 python2.7-dev python-pip python-apt python-yaml python-jinja2 build-essential
sudo
git-core libmysqlclient-dev libffi-dev libssl-dev
#
apt-get install -y python2.7 python2.7-dev python-pip python-apt python-yaml python-jinja2 build-essential sudo git-core libmysqlclient-dev libffi-dev libssl-dev
# Workaround for a 16.04 bug, need to upgrade to latest and then
# potentially downgrade to the preferred version.
if
[[
"xenial"
=
"
${
SHORT_DIST
}
"
]]
;
then
#apt-get install -y python2.7 python2.7-dev python-pip python-apt python-yaml python-jinja2
pip install
--upgrade
pip
pip install
--upgrade
pip
==
"
${
PIP_VERSION
}
"
pip install
--upgrade
pip
-i
https://pypi.tuna.tsinghua.edu.cn/simple/
pip install
--upgrade
pip
==
"
${
PIP_VERSION
}
"
-i
https://pypi.tuna.tsinghua.edu.cn/simple/
#apt-get install -y build-essential sudo git-core libmysqlclient-dev
else
#apt-get install -y python2.7 python2.7-dev python-pip python-apt python-yaml python-jinja2 build-essential sudo git-core libmysqlclient-dev
pip install
--upgrade
pip
==
"
${
PIP_VERSION
}
"
pip install
--upgrade
pip
==
"
${
PIP_VERSION
}
"
-i
https://pypi.tuna.tsinghua.edu.cn/simple/
fi
# pip moves to /usr/local/bin when upgraded
PATH
=
/usr/local/bin:
${
PATH
}
pip install
setuptools
==
"
${
SETUPTOOLS_VERSION
}
"
pip install
virtualenv
==
"
${
VIRTUAL_ENV_VERSION
}
"
pip install
setuptools
==
"
${
SETUPTOOLS_VERSION
}
"
-i
https://pypi.tuna.tsinghua.edu.cn/simple/
pip install
virtualenv
==
"
${
VIRTUAL_ENV_VERSION
}
"
-i
https://pypi.tuna.tsinghua.edu.cn/simple/
if
[[
"true"
==
"
${
RUN_ANSIBLE
}
"
]]
;
then
...
...
util/jenkins/get-rc-branches.sh
View file @
05af145f
...
...
@@ -17,7 +17,7 @@ usage() {
-r repo to look in
-f filter string for branch list
Example:
$prog
-r https://git
hub
.com/edx/edx-platform -f "rc/"
Example:
$prog
-r https://git
.orhontech
.com/edx/edx-platform -f "rc/"
EOF
}
...
...
util/vagrant/upgrade.sh
View file @
05af145f
...
...
@@ -204,7 +204,7 @@ chmod 777 $TEMPDIR
cd
$TEMPDIR
# Set the CONFIGURATION_TARGET environment variable to use a different branch
# in the configuration repo, defaults to $TARGET.
git clone https://git
hub.com/e
dx/configuration.git
\
git clone https://git
.orhontech.com/OpenE
dx/configuration.git
\
--depth
=
1
--single-branch
--branch
=
${
CONFIGURATION_TARGET
-
$TARGET
}
make_config_venv
...
...
@@ -213,7 +213,7 @@ make_config_venv
if
[[
$TARGET
==
*
dogwood
*
]]
;
then
# Run the forum migrations.
cat
>
migrate-008-context.js <<
"EOF"
// from: https://git
hub
.com/edx/cs_comments_service/blob/master/scripts/db/migrate-008-context.js
// from: https://git
.orhontech
.com/edx/cs_comments_service/blob/master/scripts/db/migrate-008-context.js
print
(
"Add the new indexes for the context field"
)
;
db.contents.ensureIndex
({
_type: 1, course_id: 1, context: 1, pinned:
-1
, created_at:
-1
}
,
{
background:
true
})
db.contents.ensureIndex
({
_type: 1, commentable_id: 1, context: 1, pinned:
-1
, created_at:
-1
}
,
{
background:
true
})
...
...
util/vpc-tools/abbey.py
View file @
05af145f
...
...
@@ -313,7 +313,7 @@ if [[ -z "$ANSIBLE_VERSION" ]]; then
fi
if [[ -z "$CONFIGURATION_REPO" ]]; then
CONFIGURATION_REPO="https://git
hub.com/e
dx/configuration.git"
CONFIGURATION_REPO="https://git
.orhontech.com/OpenE
dx/configuration.git"
fi
if [[ -z "$CONFIGURATION_VERSION" ]]; then
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment