Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Paul Graydon
slapos.core
Commits
07a0d860
Commit
07a0d860
authored
Dec 05, 2017
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_web_deploy: Support more distros and install whatever ansible available (1.9 or 2)...
parent
c2008ea6
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
18 deletions
+6
-18
master/bt5/slapos_web_deploy/PathTemplateItem/web_page_module/deploy_base_setup.txt
...oy/PathTemplateItem/web_page_module/deploy_base_setup.txt
+4
-16
master/bt5/slapos_web_deploy/PathTemplateItem/web_page_module/deploy_base_setup.xml
...oy/PathTemplateItem/web_page_module/deploy_base_setup.xml
+2
-2
No files found.
master/bt5/slapos_web_deploy/PathTemplateItem/web_page_module/deploy_base_setup.txt
View file @
07a0d860
...
...
@@ -40,7 +40,7 @@ fi
# Warn users who aren't on an explicitly supported distro, but allow them to
# override check and attempt installation with ``export FORCE=yes``
if [[ ! ${DISTRO} =~ (wheezy|jessie|trusty|vivid|xenial|rhel7|rhel6|LinuxMint-17.2) ]]; then
if [[ ! ${DISTRO} =~ (wheezy|jessie|trusty|vivid|xenial|rhel7|rhel6|LinuxMint-17.2
|f20|f19|f26|artful|stretch
) ]]; then
echo "WARNING: this script has not been tested on $DISTRO"
if [[ "$FORCE" != "yes" ]]; then
die $LINENO "If you wish to run this script anyway run with FORCE=yes"
...
...
@@ -52,7 +52,7 @@ if [[ $DISTRO == "wheezy" ]]; then
echo "deb http://ftp.debian.org/debian wheezy-backports main contrib " > /etc/apt/sources.list.d/wheezy-backports.list
fi
if is_fedora && [[ $DISTRO =
= "rhel7"
]]; then
if is_fedora && [[ $DISTRO =
~ rhel7|f20|f19
]]; then
# RHEL requires EPEL for many Ansible dependencies
# NOTE: We always remove and install latest -- some environments
...
...
@@ -123,20 +123,8 @@ EOF
fi
is_package_installed openssl || install_package openssl
# stick to a specific ansible package version
if is_ubuntu; then
# is_ubuntu also handle debian distro
is_package_installed ansible || install_package ansible=1.*
elif is_fedora; then
# is_fedora also handle CentOS distro
if [[ "$os_VENDOR" =~ (CentOS) ]] ; then
is_package_installed ansible || install_package ansible
else
is_package_installed ansible || install_package ansible1.9.noarch
fi
else
is_package_installed ansible || install_package ansible
fi
is_package_installed ansible || install_package ansible
is_package_installed python-setuptools || install_package python-setuptools
if is_ubuntu && [[ $DISTRO == "trusty" ]]; then
...
...
master/bt5/slapos_web_deploy/PathTemplateItem/web_page_module/deploy_base_setup.xml
View file @
07a0d860
...
...
@@ -237,7 +237,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
9
55.9190.35092.39833
</string>
</value>
<value>
<string>
9
61.29395.5252.38758
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -255,7 +255,7 @@
</tuple>
<state>
<tuple>
<float>
1
478606319.62
</float>
<float>
1
512479078.93
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
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