From c607b26c0a110507f0d2fd8000c8c91f4340b7be Mon Sep 17 00:00:00 2001
From: s3lph <account-gitlab-ideynizv@kernelpanic.lol>
Date: Fri, 19 Oct 2018 21:46:41 +0200
Subject: [PATCH] Fixed gitignore and added missing files

---
 .gitignore                                    |  2 +-
 .gitlab-ci.yml                                |  5 ++-
 package/archlinux/matemat/etc/matemat.conf    | 32 +++++++++++++++++++
 .../matemat/usr/lib/matemat/matemat.conf      | 11 +++++++
 package/debian/matemat/etc/matemat.conf       | 32 +++++++++++++++++++
 .../matemat/usr/lib/matemat/matemat.conf      | 11 +++++++
 6 files changed, 89 insertions(+), 4 deletions(-)
 create mode 100644 package/archlinux/matemat/etc/matemat.conf
 create mode 100644 package/archlinux/matemat/usr/lib/matemat/matemat.conf
 create mode 100644 package/debian/matemat/etc/matemat.conf
 create mode 100644 package/debian/matemat/usr/lib/matemat/matemat.conf

diff --git a/.gitignore b/.gitignore
index ea15acd..5bda33f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,4 @@
 *.sqlite3
 *.db
 static/upload/
-**/matemat.conf
+./matemat.conf
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0fd1fa7..417ff54 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -84,14 +84,13 @@ build_archlinux:
   stage: build
   image: base/devel:latest  # Use an archlinux image instead of the customized debian image.
   script:
+  - pacman -Sy python
   - cp -r static/ package/archlinux/matemat/usr/lib/matemat/static/
   - 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
-  - export PYTHON_BIN=$(which python3)
+  - python3 setup.py egg_info -d -b +master install --root=package/archlinux/matemat/ --prefix=/usr --optimize=1
   - cd package/archlinux
   - mv matemat/usr/bin/matemat matemat/usr/lib/matemat/matemat
   - 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}
   - mv matemat-${MATEMAT_VERSION}-1-any.pkg.tar.xz "matemat-${MATEMAT_VERSION}+${CI_COMMIT_REF_NAME}-1-any.pkg.tar.xz"
   artifacts:
diff --git a/package/archlinux/matemat/etc/matemat.conf b/package/archlinux/matemat/etc/matemat.conf
new file mode 100644
index 0000000..1339a49
--- /dev/null
+++ b/package/archlinux/matemat/etc/matemat.conf
@@ -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]
diff --git a/package/archlinux/matemat/usr/lib/matemat/matemat.conf b/package/archlinux/matemat/usr/lib/matemat/matemat.conf
new file mode 100644
index 0000000..5c34f56
--- /dev/null
+++ b/package/archlinux/matemat/usr/lib/matemat/matemat.conf
@@ -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
diff --git a/package/debian/matemat/etc/matemat.conf b/package/debian/matemat/etc/matemat.conf
new file mode 100644
index 0000000..1339a49
--- /dev/null
+++ b/package/debian/matemat/etc/matemat.conf
@@ -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]
diff --git a/package/debian/matemat/usr/lib/matemat/matemat.conf b/package/debian/matemat/usr/lib/matemat/matemat.conf
new file mode 100644
index 0000000..5c34f56
--- /dev/null
+++ b/package/debian/matemat/usr/lib/matemat/matemat.conf
@@ -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