/opt/osp is hardcoded ;(
This commit is contained in:
parent
33a1ec3fdb
commit
64b0a91383
|
@ -117,12 +117,12 @@
|
||||||
- name: Clone OSP repository
|
- name: Clone OSP repository
|
||||||
git:
|
git:
|
||||||
repo: "{{ osp_git_root }}"
|
repo: "{{ osp_git_root }}"
|
||||||
dest: "/var/lib/osp/"
|
dest: "/opt/osp/"
|
||||||
version: "{{ osp_git_commit }}"
|
version: "{{ osp_git_commit }}"
|
||||||
|
|
||||||
- name: Install python requirements
|
- name: Install python requirements
|
||||||
pip:
|
pip:
|
||||||
requirements: /var/lib/osp/setup/requirements.txt
|
requirements: /opt/osp/setup/requirements.txt
|
||||||
virtualenv: /opt/osp-venv
|
virtualenv: /opt/osp-venv
|
||||||
|
|
||||||
- name: Create cache directory
|
- name: Create cache directory
|
||||||
|
@ -149,12 +149,12 @@
|
||||||
notify: restart osp
|
notify: restart osp
|
||||||
file:
|
file:
|
||||||
src: "/etc/osp.conf"
|
src: "/etc/osp.conf"
|
||||||
dest: "/var/lib/osp/conf/config.py"
|
dest: "/opt/osp/conf/config.py"
|
||||||
state: link
|
state: link
|
||||||
|
|
||||||
- name: Permissions for database
|
- name: Permissions for database
|
||||||
file:
|
file:
|
||||||
path: "/var/lib/osp/{{ item }}"
|
path: "/opt/osp/{{ item }}"
|
||||||
owner: http
|
owner: http
|
||||||
group: http
|
group: http
|
||||||
recurse: yes
|
recurse: yes
|
||||||
|
@ -167,8 +167,8 @@
|
||||||
become_user: http
|
become_user: http
|
||||||
command: python3 manage.py db init
|
command: python3 manage.py db init
|
||||||
args:
|
args:
|
||||||
chdir: /var/lib/osp/
|
chdir: /opt/osp/
|
||||||
creates: /var/lib/osp/db/database.db
|
creates: /opt/osp/db/database.db
|
||||||
|
|
||||||
- name: Install services files and workers
|
- name: Install services files and workers
|
||||||
notify: restart osp
|
notify: restart osp
|
||||||
|
|
|
@ -161,7 +161,7 @@ shaper_rules:
|
||||||
|
|
||||||
auth_use_cache: false
|
auth_use_cache: false
|
||||||
auth_password_format: scram
|
auth_password_format: scram
|
||||||
extauth_program: "/usr/bin/python3 /var/lib/osp/setup/ejabberd/auth_osp.py"
|
extauth_program: "/usr/bin/python3 /opt/osp/setup/ejabberd/auth_osp.py"
|
||||||
extauth_instances: 3
|
extauth_instances: 3
|
||||||
|
|
||||||
host_config:
|
host_config:
|
||||||
|
|
|
@ -71,7 +71,7 @@ http {
|
||||||
}
|
}
|
||||||
|
|
||||||
# OSP Edge Streaming Nodes
|
# OSP Edge Streaming Nodes
|
||||||
include /var/lib/osp/conf/osp-edge.conf;
|
include /opt/osp/conf/osp-edge.conf;
|
||||||
|
|
||||||
|
|
||||||
server {
|
server {
|
||||||
|
@ -86,7 +86,7 @@ http {
|
||||||
}
|
}
|
||||||
|
|
||||||
location /stat.xsl {
|
location /stat.xsl {
|
||||||
root /var/lib/osp/static;
|
root /opt/osp/static;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -76,7 +76,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
location /static {
|
location /static {
|
||||||
alias /var/lib/osp/static;
|
alias /opt/osp/static;
|
||||||
}
|
}
|
||||||
|
|
||||||
location ~ /images(.*) {
|
location ~ /images(.*) {
|
||||||
|
|
|
@ -6,7 +6,7 @@ PartOf=osp.target
|
||||||
[Service]
|
[Service]
|
||||||
User=http
|
User=http
|
||||||
Group=http
|
Group=http
|
||||||
WorkingDirectory=/var/lib/osp
|
WorkingDirectory=/opt/osp
|
||||||
Environment="VIRTUAL_ENV=/opt/osp-venv"
|
Environment="VIRTUAL_ENV=/opt/osp-venv"
|
||||||
Environment="PATH=/opt/osp-venv/bin:/usr/local/bin:/usr/bin:/bin"
|
Environment="PATH=/opt/osp-venv/bin:/usr/local/bin:/usr/bin:/bin"
|
||||||
ExecStart=/opt/osp-venv/bin/gunicorn app:app -k geventwebsocket.gunicorn.workers.GeventWebSocketWorker -w 1 --bind 0.0.0.0:%i --reload --access-logfile /var/log/osp/access.log --error-logfile /var/log/osp/error.log
|
ExecStart=/opt/osp-venv/bin/gunicorn app:app -k geventwebsocket.gunicorn.workers.GeventWebSocketWorker -w 1 --bind 0.0.0.0:%i --reload --access-logfile /var/log/osp/access.log --error-logfile /var/log/osp/error.log
|
||||||
|
|
Loading…
Reference in New Issue