Compare commits

...

17 Commits

Author SHA1 Message Date
468b70bc99 Merge pull request 'Add Drone CI' (!8) from drone into main
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: kompetenzinventar/ki-ansible#8
2024-09-10 13:47:38 +02:00
a5d28bc60f
Move comment to see if Drone accepts it
All checks were successful
continuous-integration/drone/pr Build is passing
2024-09-10 13:44:29 +02:00
b8fc524633
Fix REUSE compliance
Some checks reported errors
continuous-integration/drone/push Build encountered an error
2024-09-10 13:40:13 +02:00
e97db0b40a
Add Drone config 2024-09-10 13:39:54 +02:00
59a68f9fdb
Switch to Docker Compose v2 2024-04-16 15:27:13 +02:00
b40f9f7213
Update MariaDB environment variables 2024-04-16 14:54:16 +02:00
420d5947c0
Switch to Gitea registry 2023-12-04 22:15:18 +01:00
7cef10c915
Fix linter issue 2023-12-04 22:11:43 +01:00
75f008d062 Merge pull request 'Fix linting issues' (!7) from Brain/ki-ansible:patch-4 into main
Reviewed-on: kompetenzinventar/ki-ansible#7
2023-12-04 22:10:05 +01:00
9c6732ba4b
Fix linting issues 2022-11-01 16:39:00 +01:00
62f58138e3
Fix linting issues 2022-05-10 15:25:20 +02:00
4f0eb7b86c Merge pull request 'Neue Variablen' (#5) from Brain/ki-ansible:patch-2 into main
Reviewed-on: kompetenzinventar/ki-ansible#5
2021-12-07 08:31:18 +01:00
18f869b0bd
Merge branch 'main' into patch-2 2021-12-06 16:53:18 +01:00
baf31afd4a Merge pull request 'Add missing 'become'' (#6) from Brain/ki-ansible:patch-3 into main
Reviewed-on: kompetenzinventar/ki-ansible#6
2021-12-06 16:41:19 +01:00
c702aa7876 Merge pull request 'Auth-Variable verwenden' (#4) from Brain/ki-ansible:patch-1 into main
Reviewed-on: kompetenzinventar/ki-ansible#4
2021-12-06 16:39:44 +01:00
727b8c74d0 Add missing 'become' 2021-12-06 15:38:58 +01:00
59fa0fd2a9
Add new variables for prod 2021-12-06 15:29:25 +01:00
7 changed files with 178 additions and 26 deletions

27
.drone.yml Normal file
View File

@ -0,0 +1,27 @@
---
# SPDX-FileCopyrightText: 2024 WTF Kooperative eG <https://wtf-eg.de/>
# SPDX-License-Identifier: CC0-1.0
kind: pipeline
type: docker
name: compliance
trigger:
event:
- push
- pull_request
branch:
- main
steps:
- name: reuse
image: fsfe/reuse:4.0.3-debian
- name: yamllint
image: alpine:3.20
commands:
- apk add yamllint
- yamllint .
- name: ansible-lint
image: quay.io/ansible/creator-ee:v24.2.0
commands:
- ansible-lint

4
.yamllint Normal file
View File

@ -0,0 +1,4 @@
# SPDX-FileCopyrightText: 2024 WTF Kooperative eG <https://wtf-eg.de/>
# SPDX-License-Identifier: CC0-1.0
---
extends: default

121
LICENSES/CC0-1.0.txt Normal file
View File

@ -0,0 +1,121 @@
Creative Commons Legal Code
CC0 1.0 Universal
CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
HEREUNDER.
Statement of Purpose
The laws of most jurisdictions throughout the world automatically confer
exclusive Copyright and Related Rights (defined below) upon the creator
and subsequent owner(s) (each and all, an "owner") of an original work of
authorship and/or a database (each, a "Work").
Certain owners wish to permanently relinquish those rights to a Work for
the purpose of contributing to a commons of creative, cultural and
scientific works ("Commons") that the public can reliably and without fear
of later claims of infringement build upon, modify, incorporate in other
works, reuse and redistribute as freely as possible in any form whatsoever
and for any purposes, including without limitation commercial purposes.
These owners may contribute to the Commons to promote the ideal of a free
culture and the further production of creative, cultural and scientific
works, or to gain reputation or greater distribution for their Work in
part through the use and efforts of others.
For these and/or other purposes and motivations, and without any
expectation of additional consideration or compensation, the person
associating CC0 with a Work (the "Affirmer"), to the extent that he or she
is an owner of Copyright and Related Rights in the Work, voluntarily
elects to apply CC0 to the Work and publicly distribute the Work under its
terms, with knowledge of his or her Copyright and Related Rights in the
Work and the meaning and intended legal effect of CC0 on those rights.
1. Copyright and Related Rights. A Work made available under CC0 may be
protected by copyright and related or neighboring rights ("Copyright and
Related Rights"). Copyright and Related Rights include, but are not
limited to, the following:
i. the right to reproduce, adapt, distribute, perform, display,
communicate, and translate a Work;
ii. moral rights retained by the original author(s) and/or performer(s);
iii. publicity and privacy rights pertaining to a person's image or
likeness depicted in a Work;
iv. rights protecting against unfair competition in regards to a Work,
subject to the limitations in paragraph 4(a), below;
v. rights protecting the extraction, dissemination, use and reuse of data
in a Work;
vi. database rights (such as those arising under Directive 96/9/EC of the
European Parliament and of the Council of 11 March 1996 on the legal
protection of databases, and under any national implementation
thereof, including any amended or successor version of such
directive); and
vii. other similar, equivalent or corresponding rights throughout the
world based on applicable law or treaty, and any national
implementations thereof.
2. Waiver. To the greatest extent permitted by, but not in contravention
of, applicable law, Affirmer hereby overtly, fully, permanently,
irrevocably and unconditionally waives, abandons, and surrenders all of
Affirmer's Copyright and Related Rights and associated claims and causes
of action, whether now known or unknown (including existing as well as
future claims and causes of action), in the Work (i) in all territories
worldwide, (ii) for the maximum duration provided by applicable law or
treaty (including future time extensions), (iii) in any current or future
medium and for any number of copies, and (iv) for any purpose whatsoever,
including without limitation commercial, advertising or promotional
purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
member of the public at large and to the detriment of Affirmer's heirs and
successors, fully intending that such Waiver shall not be subject to
revocation, rescission, cancellation, termination, or any other legal or
equitable action to disrupt the quiet enjoyment of the Work by the public
as contemplated by Affirmer's express Statement of Purpose.
3. Public License Fallback. Should any part of the Waiver for any reason
be judged legally invalid or ineffective under applicable law, then the
Waiver shall be preserved to the maximum extent permitted taking into
account Affirmer's express Statement of Purpose. In addition, to the
extent the Waiver is so judged Affirmer hereby grants to each affected
person a royalty-free, non transferable, non sublicensable, non exclusive,
irrevocable and unconditional license to exercise Affirmer's Copyright and
Related Rights in the Work (i) in all territories worldwide, (ii) for the
maximum duration provided by applicable law or treaty (including future
time extensions), (iii) in any current or future medium and for any number
of copies, and (iv) for any purpose whatsoever, including without
limitation commercial, advertising or promotional purposes (the
"License"). The License shall be deemed effective as of the date CC0 was
applied by Affirmer to the Work. Should any part of the License for any
reason be judged legally invalid or ineffective under applicable law, such
partial invalidity or ineffectiveness shall not invalidate the remainder
of the License, and in such case Affirmer hereby affirms that he or she
will not (i) exercise any of his or her remaining Copyright and Related
Rights in the Work or (ii) assert any associated claims and causes of
action with respect to the Work, in either case contrary to Affirmer's
express Statement of Purpose.
4. Limitations and Disclaimers.
a. No trademark or patent rights held by Affirmer are waived, abandoned,
surrendered, licensed or otherwise affected by this document.
b. Affirmer offers the Work as-is and makes no representations or
warranties of any kind concerning the Work, express, implied,
statutory or otherwise, including without limitation warranties of
title, merchantability, fitness for a particular purpose, non
infringement, or the absence of latent or other defects, accuracy, or
the present or absence of errors, whether or not discoverable, all to
the greatest extent permissible under applicable law.
c. Affirmer disclaims responsibility for clearing rights of other persons
that may apply to the Work or any use thereof, including without
limitation any person's Copyright and Related Rights in the Work.
Further, Affirmer disclaims responsibility for obtaining any necessary
consents, permissions or other rights required for any use of the
Work.
d. Affirmer understands and acknowledges that Creative Commons is not a
party to this document and has no duty or obligation with respect to
this CC0 or use of the Work.

11
Pipfile
View File

@ -1,11 +0,0 @@
[[source]]
url = "https://pypi.org/simple"
verify_ssl = true
name = "pypi"
[packages]
[dev-packages]
[requires]
python_version = "3.8"

View File

@ -1,8 +1,11 @@
# SPDX-FileCopyrightText: 2021 WTF Kooperative eG <https://wtf-eg.de/>
#
# SPDX-License-Identifier: AGPL-3.0-or-later
--- ---
ki_frontend_image: registry.wtf-eg.net/ki-frontend:latest ki_frontend_image: git.wtf-eg.de/kompetenzinventar/frontend:latest
ki_frontend_uri: https://ki-wtf-eg.de/ ki_frontend_uri: https://ki-wtf-eg.de/
ki_frontend_port: 13337 ki_frontend_port: 13337
ki_backend_image: registry.wtf-eg.net/ki-backend:latest ki_backend_image: git.wtf-eg.de/kompetenzinventar/backend:latest
ki_backend_uri: https://ki-wtf-eg.de/api ki_backend_uri: https://ki-wtf-eg.de/api
ki_backend_port: 13338 ki_backend_port: 13338
ki_db_image: mariadb:10.6.3 ki_db_image: mariadb:10.6.3
@ -11,3 +14,5 @@ ki_ldap_url: ldaps://idp01.wtf-eg.net:636
ki_ldap_auth_user: "" ki_ldap_auth_user: ""
ki_ldap_auth_password: "" ki_ldap_auth_password: ""
ki_ldap_base_dn: ou=people,dc=wtf-eg,dc=de ki_ldap_base_dn: ou=people,dc=wtf-eg,dc=de
ki_flask_env: development
ki_loglevel: 10

View File

@ -3,18 +3,18 @@
# SPDX-License-Identifier: AGPL-3.0-or-later # SPDX-License-Identifier: AGPL-3.0-or-later
--- ---
- name: be sure the ki config directory exists - name: Be sure the ki config directory exists
become: true become: true
file: ansible.builtin.file:
path: /var/docker/ki path: /var/docker/ki
state: directory state: directory
owner: root owner: root
group: root group: root
mode: "0755" mode: "0755"
- name: be sure the ki files are in place - name: Be sure the ki files are in place
become: true become: true
template: ansible.builtin.template:
src: "{{ item }}.j2" src: "{{ item }}.j2"
dest: "/var/docker/ki/{{ item }}" dest: "/var/docker/ki/{{ item }}"
owner: root owner: root
@ -24,7 +24,8 @@
- config.js - config.js
- docker-compose.yml - docker-compose.yml
- name: be sure the ki services are running - name: Be sure the ki services are running
community.docker.docker_compose: become: true
community.docker.docker_compose_v2:
project_src: /var/docker/ki project_src: /var/docker/ki
pull: yes pull: always

View File

@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2021 WTF Kooperative eG <https://wtf-eg.de/>
#
# SPDX-License-Identifier: AGPL-3.0-or-later
---
version: "3" version: "3"
networks: networks:
@ -16,8 +20,8 @@ services:
- ki - ki
environment: environment:
SQLALCHEMY_DATABASE_URI: "mariadb+pymysql://ki:{{ ki_db_password }}@ki_db:3306/ki" SQLALCHEMY_DATABASE_URI: "mariadb+pymysql://ki:{{ ki_db_password }}@ki_db:3306/ki"
FLASK_ENV: "development" FLASK_ENV: "{{ ki_flask_env }}"
KI_LOGLEVEL: "10" KI_LOGLEVEL: "{{ ki_loglevel }}"
KI_AUTH: "{{ ki_auth }}" KI_AUTH: "{{ ki_auth }}"
KI_LDAP_URL: "{{ ki_ldap_url }}" KI_LDAP_URL: "{{ ki_ldap_url }}"
KI_LDAP_AUTH_USER: "{{ ki_ldap_auth_user }}" KI_LDAP_AUTH_USER: "{{ ki_ldap_auth_user }}"
@ -43,9 +47,10 @@ services:
aliases: aliases:
- ki_db - ki_db
environment: environment:
MYSQL_ROOT_PASSWORD: "{{ ki_db_root_password }}" MARIADB_ROOT_PASSWORD: "{{ ki_db_root_password }}"
MYSQL_DATABASE: ki MARIADB_DATABASE: ki
MYSQL_USER: ki MARIADB_USER: ki
MYSQL_PASSWORD: "{{ ki_db_password }}" MARIADB_PASSWORD: "{{ ki_db_password }}"
MARIADB_AUTO_UPGRADE: 1
volumes: volumes:
- ki_db:/var/lib/mysql/ - ki_db:/var/lib/mysql/