Fixed gitignore and added missing files

This commit is contained in:
s3lph 2018-10-19 21:46:41 +02:00
parent b59b5a3dba
commit c607b26c0a
6 changed files with 89 additions and 4 deletions

2
.gitignore vendored
View file

@ -10,4 +10,4 @@
*.sqlite3 *.sqlite3
*.db *.db
static/upload/ static/upload/
**/matemat.conf ./matemat.conf

View file

@ -84,14 +84,13 @@ build_archlinux:
stage: build stage: build
image: base/devel:latest # Use an archlinux image instead of the customized debian image. image: base/devel:latest # Use an archlinux image instead of the customized debian image.
script: script:
- pacman -Sy python
- cp -r static/ package/archlinux/matemat/usr/lib/matemat/static/ - cp -r static/ package/archlinux/matemat/usr/lib/matemat/static/
- cp -r templates/ package/archlinux/matemat/usr/lib/matemat/templates/ - cp -r templates/ package/archlinux/matemat/usr/lib/matemat/templates/
- python3.7 setup.py egg_info -d -b +master install --root=package/archlinux/matemat/ --prefix=/usr --optimize=1 - python3 setup.py egg_info -d -b +master install --root=package/archlinux/matemat/ --prefix=/usr --optimize=1
- export PYTHON_BIN=$(which python3)
- cd package/archlinux - cd package/archlinux
- mv matemat/usr/bin/matemat matemat/usr/lib/matemat/matemat - mv matemat/usr/bin/matemat matemat/usr/lib/matemat/matemat
- rm -rf matemat/usr/bin - rm -rf matemat/usr/bin
- find . -type f -exec sed -re "s#${PYTHON_BIN}#/usr/bin/python3.7#g" -i {} \;
- makepkg -s MATEMAT_VERSION=${MATEMAT_VERSION} - makepkg -s MATEMAT_VERSION=${MATEMAT_VERSION}
- mv matemat-${MATEMAT_VERSION}-1-any.pkg.tar.xz "matemat-${MATEMAT_VERSION}+${CI_COMMIT_REF_NAME}-1-any.pkg.tar.xz" - mv matemat-${MATEMAT_VERSION}-1-any.pkg.tar.xz "matemat-${MATEMAT_VERSION}+${CI_COMMIT_REF_NAME}-1-any.pkg.tar.xz"
artifacts: artifacts:

View file

@ -0,0 +1,32 @@
[Matemat]
# The IP address to listen on
Address=::
# The TCP port to listen on
Port=80
# The log level, one of NONE, DEBUG, INFO, WARNING, ERROR, CRITICAL
LogLevel=DEBUG
[Pagelets]
# Name of the Matemat instance, shown in the web app
InstanceName=Matemat
#
# Configure SMTP credentials
#
# SmtpFrom=matemat@example.com
# SmtpSubj=Matemat Receipt
# SmtpHost=exmaple.com
# SmtpPort=587
# SmtpUser=matemat@example.com
# SmtpPass=supersecurepassword
#
# Enable to allow users to receive receipts via email
#
# SmtpSendReceipts=1
# Add static HTTP headers in this section
# [HttpHeaders]

View file

@ -0,0 +1,11 @@
[Matemat]
StaticPath=/usr/lib/matemat/static
TemplatePath=/usr/lib/matemat/templates
LogTarget=stdout
[Pagelets]
UploadDir=/var/lib/matemat/upload
DatabaseFile=/var/lib/matemat/matemat.db

View file

@ -0,0 +1,32 @@
[Matemat]
# The IP address to listen on
Address=::
# The TCP port to listen on
Port=80
# The log level, one of NONE, DEBUG, INFO, WARNING, ERROR, CRITICAL
LogLevel=DEBUG
[Pagelets]
# Name of the Matemat instance, shown in the web app
InstanceName=Matemat
#
# Configure SMTP credentials
#
# SmtpFrom=matemat@example.com
# SmtpSubj=Matemat Receipt
# SmtpHost=exmaple.com
# SmtpPort=587
# SmtpUser=matemat@example.com
# SmtpPass=supersecurepassword
#
# Enable to allow users to receive receipts via email
#
# SmtpSendReceipts=1
# Add static HTTP headers in this section
# [HttpHeaders]

View file

@ -0,0 +1,11 @@
[Matemat]
StaticPath=/usr/lib/matemat/static
TemplatePath=/usr/lib/matemat/templates
LogTarget=stdout
[Pagelets]
UploadDir=/var/lib/matemat/upload
DatabaseFile=/var/lib/matemat/matemat.db