Skip to content

Commit

Permalink
Updating packaging
Browse files Browse the repository at this point in the history
  • Loading branch information
bitbyt3r committed May 5, 2021
1 parent 442073a commit 297e285
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 22 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
[![Copr build status](https://copr.fedorainfracloud.org/coprs/bitbyt3r/Tuber/package/tuber/status_image/last_build.png)](https://copr.fedorainfracloud.org/coprs/bitbyt3r/Tuber/package/tuber/)
[![Heroku CI Status](https://tuber-ci-badge.herokuapp.com/last.svg)](https://dashboard.heroku.com/pipelines/6ebd065d-db02-419d-80bd-6406f271d992/tests)
[![codecov](https://codecov.io/gh/magfest/tuber/branch/master/graph/badge.svg)](https://codecov.io/gh/magfest/tuber)
[![Docker Cloud Build Status](https://img.shields.io/docker/cloud/build/magfest/tuber)](https://hub.docker.com/repository/docker/magfest/tuber)
[![Read the Docs](https://img.shields.io/readthedocs/magfest-tuber)](https://magfest-tuber.readthedocs.io/en/latest/)

Table of Contents
=================
Expand Down
21 changes: 21 additions & 0 deletions contrib/nginx.conf.rhel
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
server {
listen 80;
root /usr/share/tuber/web;
index index.html;

client_max_body_size 0;
proxy_request_buffering off;
proxy_read_timeout 7200;

location /api {
proxy_pass http://backend:8080/api;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection $connection_upgrade;
proxy_read_timeout 3600s;
}

location / {
try_files $uri /index.html;
}
}
3 changes: 3 additions & 0 deletions contrib/tuber
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
FLASK_ENV=production
MIGRATIONS_PATH=/usr/share/tuber/migrations
DATABASE_URL=sqlite:///var/lib/tuber/database.db
3 changes: 3 additions & 0 deletions contrib/tuber.devel
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
FLASK_ENV=development
MIGRATIONS_PATH=migrations
DATABASE_URL=sqlite:///database.db
6 changes: 0 additions & 6 deletions contrib/tuber.json

This file was deleted.

6 changes: 0 additions & 6 deletions contrib/tuber.json.devel

This file was deleted.

1 change: 1 addition & 0 deletions contrib/tuber.service
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ Description=Tuber gunicorn daemon
After=network.target

[Service]
EnvironmentFile=/etc/default/tuber
ExecStart=/usr/bin/gunicorn-3 tuber.wsgi:app
ExecReload=/bin/kill -s HUP $MAINPID
ExecStop=/bin/kill -s TERM $MAINPID
Expand Down
14 changes: 4 additions & 10 deletions contrib/tuber.spec
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ URL: https://tuber.hackafe.net/
VCS: {{{ git_dir_vcs }}}
Source: {{{ git_pack }}}
BuildRequires: python3-devel
BuildRequires: python3-pip
BuildRequires: npm
BuildRequires: git
Requires: python3-passlib
Expand All @@ -26,12 +27,6 @@ Tuber is an event management system.
{{{ git_dir_setup_macro }}}

%build
echo FINDING
find
echo PWDING
pwd
echo LSING
ls
cd backend
%py3_build
cd ../frontend
Expand All @@ -48,10 +43,9 @@ mkdir -p %{buildroot}/usr/share/tuber/web/js/
mkdir -p %{buildroot}/usr/share/tuber/web/css/
mkdir -p %{buildroot}/usr/share/tuber/migrations/
mkdir -p %{buildroot}/etc/tuber
cp contrib/nginx.conf %{buildroot}/usr/share/tuber/nginx.conf
cp contrib/nginx.conf.rhel %{buildroot}/usr/share/tuber/nginx.conf
cp contrib/tuber.service %{buildroot}/usr/lib/systemd/system/
cp contrib/tuber.json %{buildroot}/etc/tuber/
cp contrib/tuber.json %{buildroot}/usr/share/tuber/
cp contrib/tuber %{buildroot}/etc/default/
cp frontend/dist/js/app.*.js %{buildroot}/usr/share/tuber/web/js/
cp frontend/dist/js/chunk-vendors.*.js %{buildroot}/usr/share/tuber/web/js/
cp frontend/dist/css/app.*.css %{buildroot}/usr/share/tuber/web/css/
Expand All @@ -61,7 +55,7 @@ cp frontend/dist/favicon.ico %{buildroot}/usr/share/tuber/web/
cp -r backend/migrations/* %{buildroot}/usr/share/tuber/migrations/

%files
%config /etc/tuber/tuber.json
%config /etc/default/tuber
/usr/lib/systemd/system/tuber.service
/usr/bin/tuber
/usr/share/tuber
Expand Down

0 comments on commit 297e285

Please sign in to comment.