diff --git a/.theia-workspace b/.theia-workspace new file mode 100644 index 00000000..c94c9c93 --- /dev/null +++ b/.theia-workspace @@ -0,0 +1,14 @@ +{ + "folders": [ + + { + "path": "fet2020" + } + ], +"settings": { + "launch": {}, + "python.linting.flake8Enabled": true, + "python.linting.banditEnabled": true, + "python.testing.pytestEnabled": true +} +} \ No newline at end of file diff --git a/.workspace.theia-workspace b/.workspace.theia-workspace deleted file mode 100644 index abf2af2a..00000000 --- a/.workspace.theia-workspace +++ /dev/null @@ -1,9 +0,0 @@ -{ - "folders": [ - - { - "path": "fet2020" - } - ], - "settings": {} -} \ No newline at end of file diff --git a/deployment/mysql.cnf b/deployment/mysql.cnf new file mode 100644 index 00000000..b3e857e2 --- /dev/null +++ b/deployment/mysql.cnf @@ -0,0 +1,11 @@ +[client] +default-character-set=utf8mb4 + +[mysql] +default-character-set=utf8mb4 + + +[mysqld] +collation-server = utf8mb4_unicode_ci +init-connect='SET NAMES utf8' +character-set-server = utf8mb4 diff --git a/docker-compose.yml b/docker-compose.yml index 76312ee4..9ecf9727 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,25 +9,25 @@ services: volumes: - /mnt/fotos/www:/app/data mysql: - image: jbergstroem/mariadb-alpine + image: mariadb environment: - SKIP_INNODB: "yes" MYSQL_DATABASE: fet2020db MYSQL_USER: user MYSQL_PASSWORD: hgu MYSQL_COLLATION: utf8_general_ci MYSQL_CHARSET: utf8 + MYSQL_ALLOW_EMPTY_PASSWORD: "yes" volumes: - ../mysql_django:/var/lib/mysql etherpadsql: - image: jbergstroem/mariadb-alpine + image: mariadb environment: - SKIP_INNODB: "no" MYSQL_DATABASE: etherpaddb MYSQL_USER: user MYSQL_PASSWORD: hgu MYSQL_COLLATION: utf8_general_ci MYSQL_CHARSET: utf8 + MYSQL_ALLOW_EMPTY_PASSWORD: "yes" volumes: - ../mysql_etherpad:/var/lib/mysql etherpad: @@ -37,8 +37,8 @@ services: DB_HOST: etherpadsql DB_PORT: 3306 DB_NAME: etherpaddb - DB_USER: user - DB_PASS: hgu + DB_USER: root + DB_PASS: "" DB_CHARSET: utf8 #ADMIN_PASSWORD: "AndiS" #REQUIRE_AUTHENTICATION: "false" @@ -51,6 +51,7 @@ services: - "9001:9001" volumes: - ./etherpad/APIKEY.txt:/opt/etherpad-lite/APIKEY.txt + - ./deployment/mysql.cnf:/etc/mysql/conf.d fet2020: image: fet2020django build: . diff --git a/fet2020/.theia/settings.json b/fet2020/.theia/settings.json index 60400e38..555f49cf 100644 --- a/fet2020/.theia/settings.json +++ b/fet2020/.theia/settings.json @@ -4,5 +4,10 @@ ], "python.testing.unittestEnabled": false, "python.testing.nosetestsEnabled": false, - "python.testing.pytestEnabled": true + "python.testing.pytestEnabled": true, + "python.pythonPath": "/usr/local/bin/python3", + "python.linting.pylintEnabled": true, + "python.linting.flake8Enabled": true, + "python.linting.banditEnabled": true, + "python.linting.enabled": true } \ No newline at end of file