Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
PEDASI
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Research Software Group
PEDASI
Commits
ec4379f8
Commit
ec4379f8
authored
6 years ago
by
James Graham
Browse files
Options
Downloads
Patches
Plain Diff
Merge nginx config
parent
188603f5
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
deploy/nginx/sites-available/pedasi
+1
-1
1 addition, 1 deletion
deploy/nginx/sites-available/pedasi
deploy/nginx/sites-available/pedasi.dev
+0
-28
0 additions, 28 deletions
deploy/nginx/sites-available/pedasi.dev
playbook.yml
+2
-12
2 additions, 12 deletions
playbook.yml
with
3 additions
and
41 deletions
deploy/nginx/sites-available/pedasi
+
1
−
1
View file @
ec4379f8
server {
server {
listen 80;
listen 80;
server_name
localhost pedasi.* pedasi-dev.* *.iotobservatory.io
;
server_name
_
;
merge_slashes off;
merge_slashes off;
...
...
This diff is collapsed.
Click to expand it.
deploy/nginx/sites-available/pedasi.dev
deleted
100644 → 0
+
0
−
28
View file @
188603f5
server {
listen 80;
merge_slashes off;
location = /favicon.ico {
alias /var/www/pedasi/static/img/favicon.ico;
}
location /static/ {
alias /var/www/pedasi/static/;
}
location = /report.html {
alias /var/www/pedasi/report.html;
auth_basic "Restricted Content";
auth_basic_user_file /etc/nginx/.htpasswd;
}
location = /robots.txt {
alias /var/www/pedasi/deploy/robots.txt;
}
location / {
include uwsgi_params;
uwsgi_pass unix:/run/uwsgi/pedasi.sock;
}
}
This diff is collapsed.
Click to expand it.
playbook.yml
+
2
−
12
View file @
ec4379f8
...
@@ -78,7 +78,7 @@
...
@@ -78,7 +78,7 @@
-
name
:
Copy settings
-
name
:
Copy settings
copy
:
copy
:
src
:
'
{{
env_file
|
default("deploy/.env
.dev
")
}}'
src
:
'
{{
env_file
|
default("deploy/.env")
}}'
dest
:
'
{{
project_dir
}}/.env'
dest
:
'
{{
project_dir
}}/.env'
owner
:
www-data
owner
:
www-data
group
:
www-data
group
:
www-data
...
@@ -155,23 +155,13 @@
...
@@ -155,23 +155,13 @@
-
{
src
:
'
{{
project_dir
}}/deploy/uwsgi/sites/pedasi.ini'
,
dest
:
/etc/uwsgi/sites/pedasi.ini
}
-
{
src
:
'
{{
project_dir
}}/deploy/uwsgi/sites/pedasi.ini'
,
dest
:
/etc/uwsgi/sites/pedasi.ini
}
-
{
src
:
'
{{
project_dir
}}/deploy/systemd/system/uwsgi.service'
,
dest
:
/etc/systemd/system/uwsgi.service
}
-
{
src
:
'
{{
project_dir
}}/deploy/systemd/system/uwsgi.service'
,
dest
:
/etc/systemd/system/uwsgi.service
}
-
name
:
Copy web config files - dev
-
name
:
Copy web config files
copy
:
src
:
'
{{
project_dir
}}/deploy/nginx/sites-available/pedasi.dev'
dest
:
/etc/nginx/sites-available/pedasi
remote_src
:
yes
# WARNING: this will not update an existing file
force
:
no
when
:
production is not defined
-
name
:
Copy web config files - production
copy
:
copy
:
src
:
'
{{
project_dir
}}/deploy/nginx/sites-available/pedasi'
src
:
'
{{
project_dir
}}/deploy/nginx/sites-available/pedasi'
dest
:
/etc/nginx/sites-available/pedasi
dest
:
/etc/nginx/sites-available/pedasi
remote_src
:
yes
remote_src
:
yes
# WARNING: this will not update an existing file
# WARNING: this will not update an existing file
force
:
no
force
:
no
when
:
production is defined
-
name
:
Activate Nginx site
-
name
:
Activate Nginx site
file
:
file
:
...
...
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