Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
mowgli
mowgli-colosseum
Commits
7e3b6285
Commit
7e3b6285
authored
May 01, 2018
by
Daniel Seybold
Browse files
removed ui.conf, fixed etcd connection for lance
parent
9bb9dfec
Pipeline
#10036
passed with stage
in 6 minutes and 35 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
36 deletions
+2
-36
init/entrypoint
init/entrypoint
+2
-2
init/ui.conf
init/ui.conf
+0
-34
No files found.
init/entrypoint
View file @
7e3b6285
...
...
@@ -68,10 +68,10 @@ function checkDatabase(){
function
start_colosseum
(){
# resolve public IP
#
PUBLIC_IP=$(dig +short myip.opendns.com @resolver1.opendns.com)
PUBLIC_IP
=
$(
dig +short myip.opendns.com @resolver1.opendns.com
)
echo
"starting colosseum..."
/opt/cloudiator/colosseum-0.2.0-SNAPSHOT/bin/colosseum
-Dconfig
.file
=
/opt/cloudiator/colosseum-0.2.0-SNAPSHOT/conf/application.conf
-Dlca
.client.config.registry
=
etcdregistry
-Dlca
.client.config.registry.etcd.hosts
=
${
ETCD_HOST
}
2>&1
>>
/var/log/colosseum.log
/opt/cloudiator/colosseum-0.2.0-SNAPSHOT/bin/colosseum
-Dconfig
.file
=
/opt/cloudiator/colosseum-0.2.0-SNAPSHOT/conf/application.conf
-Dlca
.client.config.registry
=
etcdregistry
-Dlca
.client.config.registry.etcd.hosts
=
${
PUBLIC_IP
}
2>&1
>>
/var/log/colosseum.log
}
...
...
init/ui.conf
deleted
100644 → 0
View file @
9bb9dfec
<
VirtualHost
*:
80
>
# The ServerName directive sets the request scheme, hostname and port that
# the server uses to identify itself. This is used when creating
# redirection URLs. In the context of virtual hosts, the ServerName
# specifies what hostname must appear in the request's Host: header to
# match this virtual host. For the default virtual host (this file) this
# value is not decisive as it is used as a last resort host regardless.
# However, you must set it for any further virtual host explicitly.
#ServerName www.example.com
ServerAdmin
webmaster
@
localhost
DocumentRoot
/
var
/
www
/
html
# Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
# error, crit, alert, emerg.
# It is also possible to configure the loglevel for particular
# modules, e.g.
#LogLevel info ssl:warn
ErrorLog
${
APACHE_LOG_DIR
}/
error
.
log
CustomLog
${
APACHE_LOG_DIR
}/
access
.
log
combined
<
Directory
/
var
/
www
/
html
/
ui
>
Options
Indexes
FollowSymLinks
AllowOverride
All
</
Directory
>
# For most configuration files from conf-available/, which are
# enabled or disabled at a global level, it is possible to
# include a line for only one particular virtual host. For example the
# following line enables the CGI configuration for this host only
# after it has been globally disabled with "a2disconf".
#Include conf-available/serve-cgi-bin.conf
</
VirtualHost
>
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