moved main configs to kvmd package

This commit is contained in:
Devaev Maxim 2018-07-08 01:31:11 +00:00
parent 8c9441e0a3
commit 09cccf0ffb
7 changed files with 7 additions and 10 deletions

View File

@ -11,7 +11,6 @@ release:
make push
make bump
make push
make pypi
make clean
tox:
@ -24,10 +23,6 @@ push:
git push
git push --tags
pypi:
python3 setup.py register
python3 setup.py sdist upload
clean:
rm -rf build site dist pkg src *.egg-info kvmd-*.tar.gz
find -name __pycache__ | xargs rm -rf

View File

@ -39,4 +39,7 @@ package() {
cd $srcdir/$pkgname-build
python setup.py install --root=$pkgdir
install -Dm644 kvmd.service "$pkgdir"/usr/lib/systemd/system/kvmd.service
mkdir -p "$pkgdir"/usr/share/kvmd
cp -r web "$pkgdir"/usr/share/kvmd
cp -r configs "$pkgdir"/usr/share/kvmd
}

View File

@ -40,7 +40,7 @@ http {
uwsgi_temp_path /tmp/nginx.uwsgi_temp;
location / {
root /srv/http;
root /usr/share/kvmd/web;
index index.html;
}

View File

@ -1 +0,0 @@
../os/platforms/v1/kvmd.yaml

View File

@ -6,9 +6,9 @@ RUN pkg-install \
COPY stages/pikvm/config.txt /boot/
COPY stages/pikvm/sysctl.conf /etc/sysctl.d/99-pikvm.conf
COPY stages/pikvm/udev.rules /etc/udev/rules.d/pikvm.rules
COPY stages/pikvm/index.html /srv/http/
COPY stages/pikvm/kvmd.yaml /etc/
COPY stages/pikvm/nginx.conf /etc/nginx/
RUN cp /usr/share/kvmd/configs/nginx/nginx.conf /etc/nginx/
RUN cp /usr/share/kvmd/configs/kvmd/v1.yaml /etc/kvmd.yaml
RUN systemctl enable kvmd
RUN systemctl enable nginx