Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
compose.libre.sh
Manage
Activity
Members
Labels
Plan
Issues
1
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
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
ecobytes
compose.libre.sh
Commits
f673d827
Commit
f673d827
authored
10 years ago
by
Michiel de Jong
Browse files
Options
Downloads
Patches
Plain Diff
make default site an argument of scripts/setup.sh
parent
ca854b98
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Vagrantfile
+1
-1
1 addition, 1 deletion
Vagrantfile
scripts/setup.sh
+1
-1
1 addition, 1 deletion
scripts/setup.sh
with
2 additions
and
2 deletions
Vagrantfile
+
1
−
1
View file @
f673d827
...
@@ -45,7 +45,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
...
@@ -45,7 +45,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
core
.
vm
.
synced_folder
"."
,
"/data/infrastructure"
,
id:
"coreos-infrastructure"
,
:nfs
=>
true
,
:mount_options
=>
[
'nolock,vers=3,udp'
]
core
.
vm
.
synced_folder
"."
,
"/data/infrastructure"
,
id:
"coreos-infrastructure"
,
:nfs
=>
true
,
:mount_options
=>
[
'nolock,vers=3,udp'
]
core
.
vm
.
provision
:file
,
source:
"./cloud-config"
,
destination:
"/tmp/vagrantfile-user-data"
core
.
vm
.
provision
:file
,
source:
"./cloud-config"
,
destination:
"/tmp/vagrantfile-user-data"
core
.
vm
.
provision
:shell
,
inline:
"cp /data/infrastructure/scripts/unsecure-certs/*.pem /data/server-wide/haproxy/approved-certs"
core
.
vm
.
provision
:shell
,
inline:
"cp /data/infrastructure/scripts/unsecure-certs/*.pem /data/server-wide/haproxy/approved-certs"
core
.
vm
.
provision
:shell
,
path:
"./scripts/setup.sh"
core
.
vm
.
provision
:shell
,
path:
"./scripts/setup.sh"
,
args:
[
HOSTNAME
]
core
.
vm
.
provision
:shell
,
inline:
"etcdctl set /services/default '{
\"
app
\"
:
\"
nginx
\"
,
\"
hostname
\"
:
\"
#{
HOSTNAME
}
\"
}'"
core
.
vm
.
provision
:shell
,
inline:
"etcdctl set /services/default '{
\"
app
\"
:
\"
nginx
\"
,
\"
hostname
\"
:
\"
#{
HOSTNAME
}
\"
}'"
core
.
vm
.
provision
:shell
,
path:
"./scripts/approve-user.sh"
,
args:
[
HOSTNAME
,
"nginx"
]
core
.
vm
.
provision
:shell
,
path:
"./scripts/approve-user.sh"
,
args:
[
HOSTNAME
,
"nginx"
]
end
end
...
...
This diff is collapsed.
Click to expand it.
scripts/setup.sh
+
1
−
1
View file @
f673d827
...
@@ -16,7 +16,7 @@ docker pull indiehosters/wordpress
...
@@ -16,7 +16,7 @@ docker pull indiehosters/wordpress
docker pull indiehosters/nginx
docker pull indiehosters/nginx
# Activate default domain
# Activate default domain
etcdctl
set
/services/default
'{"app":"nginx", "hostname":"
`hostname`
"}'
etcdctl
set
/services/default
'{"app":"nginx", "hostname":"
'
$1
'
"}'
# Configure and start HAproxy
# Configure and start HAproxy
mkdir
-p
/data/server-wide/haproxy/approved-certs
mkdir
-p
/data/server-wide/haproxy/approved-certs
...
...
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