Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
isochrone
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Institut für Informatik
dbis
dbis-isochrone
isochrone
Commits
6793cd42
"...git@git.uibk.ac.at:c102348/olat-ci-cd-testing-project.git" did not exist on "e2e85561b0b8eb8d9d494b52a30dd007c4ee9a96"
Commit
6793cd42
authored
10 years ago
by
User expired
Browse files
Options
Downloads
Patches
Plain Diff
upgrading backend to CentOS 7 (64bit)
parent
8f26d1e1
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Vagrantfile
+2
-2
2 additions, 2 deletions
Vagrantfile
etc/vagrant/Vagrantfile
+2
-2
2 additions, 2 deletions
etc/vagrant/Vagrantfile
etc/vagrant/bootstrap.sh
+5
-8
5 additions, 8 deletions
etc/vagrant/bootstrap.sh
with
9 additions
and
12 deletions
Vagrantfile
+
2
−
2
View file @
6793cd42
...
...
@@ -34,8 +34,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
end
# Information about the box itself (name from vagrantcloud)
config
.
vm
.
box
=
"chef/centos-6.5"
#
config.vm.box = "jayunit100/centos7"
#
config.vm.box = "chef/centos-6.5"
config
.
vm
.
box
=
"jayunit100/centos7"
# Setup of shared folders
config
.
vm
.
synced_folder
"etc/vagrant/conf"
,
"/setup/conf"
...
...
This diff is collapsed.
Click to expand it.
etc/vagrant/Vagrantfile
+
2
−
2
View file @
6793cd42
...
...
@@ -22,8 +22,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
end
# Information about the box itself (name from vagrantcloud)
config
.
vm
.
box
=
"chef/centos-6.5"
#
config.vm.box = "jayunit100/centos7"
#
config.vm.box = "chef/centos-6.5"
config
.
vm
.
box
=
"jayunit100/centos7"
# Setup of shared folders
config
.
vm
.
synced_folder
"vagrant/conf"
,
"/setup/conf"
...
...
This diff is collapsed.
Click to expand it.
etc/vagrant/bootstrap.sh
+
5
−
8
View file @
6793cd42
...
...
@@ -10,7 +10,7 @@
# - pgRouting
# - osmosis
# - osm2pgrouting
# into a centos6 environment (fedora 20 might also work, but is untested).
# into a centos6
or centos7
environment (fedora 20 might also work, but is untested).
#
# It can be used in the context of a Vagrantfile to configure a vagrant box and all
# the installations can be configured using global variables (some packages are only
...
...
@@ -205,10 +205,10 @@ DISTRI_SUPPORTED=false
DISTRI_TYPE
=
"Fedora 20"
DISTRI
=
$(
printf
"
$DISTRI_NAME
"
|
cut
-d
" "
-f
1
)
if
[
"
$DISTRI
"
==
"CentOS"
]
;
then
POSTGRESQL_SHORT_VERSION
=
"93"
POSTGRESQL_VERSION
=
"9.3"
if
printf
"
$DISTRI_NAME
"
| egrep
-q
" 6."
;
then
DISTRI_TYPE
=
"CentOS 6"
POSTGRESQL_SHORT_VERSION
=
"93"
POSTGRESQL_VERSION
=
"9.3"
REPO_ELGIS
=
"http://elgis.argeo.org/repos/6/elgis-release-6-6_0.noarch.rpm"
REPO_EPEL
=
"http://fedora.aau.at/epel/6/i386/epel-release-6-8.noarch.rpm"
REPO_POSTGRESQL_32
=
"http://yum.postgresql.org/
$POSTGRESQL_VERSION
/redhat/rhel-6-i386/pgdg-centos
$POSTGRESQL_SHORT_VERSION
-
$POSTGRESQL_VERSION
-1.noarch.rpm"
...
...
@@ -216,13 +216,10 @@ if [ "$DISTRI" == "CentOS" ]; then
DISTRI_SUPPORTED
=
true
elif
printf
"
$DISTRI_NAME
"
| egrep
-q
" 7."
;
then
DISTRI_TYPE
=
"CentOS 7"
POSTGRESQL_SHORT_VERSION
=
"94"
POSTGRESQL_VERSION
=
"9.4"
REPO_EPEL
=
"http://fedora.aau.at/epel/beta/7/x86_64/epel-release-7-0.2.noarch.rpm"
REPO_EPEL
=
"http://fedora.aau.at/epel/7/x86_64/epel-release-7-0.2.noarch.rpm"
REPO_POSTGRESQL_64
=
"http://yum.postgresql.org/
$POSTGRESQL_VERSION
/redhat/rhel-7-x86_64/pgdg-centos
$POSTGRESQL_SHORT_VERSION
-
$POSTGRESQL_VERSION
-1.noarch.rpm"
REPO_RPMFORGE_64
=
"http://pkgs.repoforge.org/rpmforge-release/rpmforge-release-0.5.3-1.el7.rf.x86_64.rpm"
# Activate centos 7 as soon as hdf5 is available as dependency for postgis (using epel); remember to update documentation of this file at the very top
# DISTRI_SUPPORTED=$IS_64_BIT
DISTRI_SUPPORTED
=
$IS_64_BIT
fi
elif
[
"
$DISTRI
"
==
"Fedora"
]
;
then
if
echo
$DISTRI_NAME
| egrep
-q
" 20 (Heisenbug)"
;
then
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment