external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-02-13 03:32:12 +00:00
Code Issues Releases Wiki Activity

Refactor: Simpler Calibre-web service

Browse source 
Systemd does take multiple arguments! Removing extranous files and
envirnoment variables.
This commit is contained in:
Arky 2018-08-26 23:12:53 +07:00
parent 21249f0623
commit 78b0b753d8
3 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
roles/calibre-web/tasks/main.yml
View file

@ -24,7 +24,8 @@
pip: pip:
requirements: requirements.txt requirements: requirements.txt
chdir: "{{ calibreweb_path }}" chdir: "{{ calibreweb_path }}"
extra_args: --target vendor extra_args: '--target vendor'
ignore_errors: True
- name: Create calibre-web systemd service unit and httpd2 configuration. - name: Create calibre-web systemd service unit and httpd2 configuration.
template: template:
@ -36,8 +37,6 @@
with_items: with_items:
- { src: 'calibre-web.service.j2', dest: '/etc/systemd/system/calibre-web.service', mode: '0644' } - { src: 'calibre-web.service.j2', dest: '/etc/systemd/system/calibre-web.service', mode: '0644' }
- { src: 'calibre-web.conf.j2', dest: '/etc/apache2/sites-available/calibre-web.conf', mode: '0644' } - { src: 'calibre-web.conf.j2', dest: '/etc/apache2/sites-available/calibre-web.conf', mode: '0644' }
- { src: 'cps.conf.j2', dest: "{{ calibreweb_home }}/cps.conf" , mode: '0644' }
- name: Provision calibre-web default metadata. - name: Provision calibre-web default metadata.
copy: copy:

5
roles/calibre-web/templates/calibre-web.service.j2
View file

@ -3,10 +3,7 @@ Description=Calibre-Web
[Service] [Service]
Type=simple Type=simple
User={{ calibreweb_user }} User={{ calibreweb_user }}
#EnvironmentFile={{ calibreweb_home }}/cps.conf ExecStart=/usr/bin/python {{ calibreweb_exec_path }} -p {{ calibreweb_config }}/{{ calibreweb_settings_database }}
#WorkingDirectory={{ calibreweb_path }}
ExecStart=/usr/bin/python {{ calibreweb_exec_path }} -p {{ calibreweb_home }}/{{ calibreweb_settings_database }}
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

2
roles/calibre-web/templates/cps.conf.j2
View file

@ -1,2 +0,0 @@
ARG1 = -p
ARG2 = {{ calibreweb_home }}/{{ calibreweb_database }}