From 396fd2f3b4b9aa9815463ec545283c2c250b9f01 Mon Sep 17 00:00:00 2001 From: Simon Cloutier Date: Fri, 28 Mar 2025 16:13:38 -0400 Subject: [PATCH] lots of changes --- .vscode/settings.json | 3 + app/Dockerfile | 5 +- app/app.py | 558 +++++++++++++++++++++++ app/templates/add_user.html | 19 + app/templates/base.html | 35 ++ app/templates/edit_attribute.html | 22 + app/templates/edit_group.html | 26 ++ app/templates/edit_groupname.html | 16 + app/templates/edit_user.html | 20 + app/templates/group_list.html | 38 ++ app/templates/group_list_nested.html | 364 +++++++++++++++ app/templates/index.html | 43 ++ app/templates/user_list.html | 364 +++++++++++++++ app/templates/user_list_inline_edit.html | 316 +++++++++++++ db-data/aria_log.00000001 | Bin 18145280 -> 18145280 bytes db-data/aria_log_control | Bin 52 -> 52 bytes db-data/ddl_recovery-backup.log | Bin 0 -> 9 bytes db-data/ib_logfile0 | Bin 100663296 -> 100663296 bytes db-data/ibdata1 | Bin 12582912 -> 12582912 bytes docker-compose.yml | 16 +- nginx/nginx.conf | 2 +- 21 files changed, 1831 insertions(+), 16 deletions(-) create mode 100644 .vscode/settings.json create mode 100644 app/templates/base.html create mode 100644 app/templates/edit_attribute.html create mode 100644 app/templates/edit_group.html create mode 100644 app/templates/edit_groupname.html create mode 100644 app/templates/group_list.html create mode 100644 app/templates/group_list_nested.html create mode 100644 app/templates/index.html create mode 100644 app/templates/user_list_inline_edit.html create mode 100644 db-data/ddl_recovery-backup.log diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..457f44d --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "python.analysis.typeCheckingMode": "basic" +} \ No newline at end of file diff --git a/app/Dockerfile b/app/Dockerfile index 4e51849..0305a18 100644 --- a/app/Dockerfile +++ b/app/Dockerfile @@ -3,10 +3,11 @@ FROM python:3.9-slim WORKDIR /app COPY requirements.txt . + RUN pip install --no-cache-dir -r requirements.txt +RUN apt-get update && apt-get install -y iputils-ping telnet # Add these lines + COPY . . -EXPOSE 5000 - CMD ["python", "app.py"] \ No newline at end of file diff --git a/app/app.py b/app/app.py index e69de29..4316137 100644 --- a/app/app.py +++ b/app/app.py @@ -0,0 +1,558 @@ +from flask import Flask, render_template, request, redirect, url_for, jsonify +import mysql.connector +import json + +app = Flask(__name__) + +DB_CONFIG = { + 'host': '192.168.60.150', + 'user': 'user_92z0Kj', + 'password': '5B3UXZV8vyrB', + 'database': 'radius_NIaIuT' +} + +def get_db(): + try: + db = mysql.connector.connect(**DB_CONFIG) + return db + except mysql.connector.Error as err: + print(f"Database Connection Error: {err}") + return None + +@app.route('/', methods=['GET', 'POST']) +def index(): + sql_results = None + sql_error = None + total_users = 0 + total_groups = 0 + + db = get_db() + if db: + cursor = db.cursor(dictionary=True) + try: + # Count total users + cursor.execute("SELECT COUNT(DISTINCT username) as total FROM radcheck;") + total_users = cursor.fetchone()['total'] + + # Count total groups + cursor.execute("SELECT COUNT(DISTINCT groupname) as total FROM radgroupreply;") + total_groups = cursor.fetchone()['total'] + + except mysql.connector.Error as err: + print(f"Error fetching counts: {err}") + + cursor.close() + db.close() + + return render_template('index.html', total_users=total_users, total_groups=total_groups, sql_results=sql_results, sql_error=sql_error) + +@app.route('/sql', methods=['POST']) +def sql(): + sql_results = None + sql_error = None + sql_query = request.form['query'] + + db = get_db() + if db: + try: + cursor = db.cursor(dictionary=True) + cursor.execute(sql_query) + sql_results = cursor.fetchall() + cursor.close() + db.close() + except mysql.connector.Error as err: + sql_error = str(err) + except Exception as e: + sql_error = str(e) + + total_users = 0 + total_groups = 0 + + db = get_db() + if db: + cursor = db.cursor(dictionary=True) + try: + # Count total users + cursor.execute("SELECT COUNT(DISTINCT username) as total FROM radcheck;") + total_users = cursor.fetchone()['total'] + + # Count total groups + cursor.execute("SELECT COUNT(DISTINCT groupname) as total FROM radgroupreply;") + total_groups = cursor.fetchone()['total'] + + except mysql.connector.Error as err: + print(f"Error fetching counts: {err}") + + cursor.close() + db.close() + + return render_template('index.html', total_users=total_users, total_groups=total_groups, sql_results=sql_results, sql_error=sql_error) + +@app.route('/user_list') +def user_list(): + db = get_db() + if db: + cursor = db.cursor(dictionary=True) + cursor.execute(""" + SELECT + rc.username AS mac_address, + IFNULL((SELECT value FROM radgroupreply rgr + WHERE rgr.groupname = (SELECT groupname FROM radusergroup rug WHERE rug.username = rc.username LIMIT 1) + AND rgr.attribute = 'Tunnel-Private-Group-Id' LIMIT 1), 'N/A') AS vlan_id, + IFNULL((SELECT value FROM radcheck rch + WHERE rch.username = rc.username AND rch.attribute = 'User-Description' LIMIT 1), 'N/A') AS description + FROM radcheck rc + GROUP BY rc.username; + """) + results = cursor.fetchall() + cursor.close() + db.close() + return render_template('user_list_inline_edit.html', results=results) + return "Database Connection Failed" + +@app.route('/update_user', methods=['POST']) +def update_user(): + mac_address = request.form['mac_address'] + description = request.form['description'] + vlan_id = request.form['vlan_id'] + + db = get_db() + if db: + cursor = db.cursor() + try: + db.autocommit = False + + cursor.execute(""" + UPDATE radcheck + SET value = %s + WHERE username = %s AND attribute = 'User-Description' + """, (description, mac_address)) + + cursor.execute(""" + UPDATE radgroupreply rgr + SET value = %s + WHERE rgr.groupname = (SELECT groupname FROM radusergroup rug WHERE rug.username = %s LIMIT 1) + AND rgr.attribute = 'Tunnel-Private-Group-Id' + """, (vlan_id, mac_address)) + + db.commit() + db.autocommit = True + cursor.close() + return "success" + except mysql.connector.Error as err: + db.rollback() + db.autocommit = True + cursor.close() + return str(err) + except Exception as e: + db.rollback() + db.autocommit = True + cursor.close() + return str(e) + finally: + db.close() + return "Database Connection Failed" + +@app.route('/delete_user/') +def delete_user(mac_address): + db = get_db() + if db: + cursor = db.cursor() + try: + cursor.execute("DELETE FROM radcheck WHERE username = %s", (mac_address,)) + db.commit() + cursor.close() + db.close() + return redirect(url_for('user_list')) + except mysql.connector.Error as err: + print(f"Database Error: {err}") + db.rollback() + cursor.close() + db.close() + return redirect(url_for('user_list')) + return "Database Connection Failed" + +@app.route('/edit_user/', methods=['GET', 'POST']) +def edit_user(mac_address): + db = get_db() + if db: + cursor = db.cursor(dictionary=True) + + if request.method == 'POST': + description = request.form['description'] + vlan_id = request.form['vlan_id'] + + cursor.execute(""" + UPDATE radcheck + SET value = %s + WHERE username = %s AND attribute = 'User-Description' + """, (description, mac_address)) + + cursor.execute(""" + UPDATE radgroupreply rgr + SET value = %s + WHERE rgr.groupname = (SELECT groupname FROM radusergroup rug WHERE rug.username = %s LIMIT 1) + AND rgr.attribute = 'Tunnel-Private-Group-Id' + """, (vlan_id, mac_address)) + + db.commit() + cursor.close() + db.close() + return redirect(url_for('user_list')) + + else: + cursor.execute(""" + SELECT + rc.username AS mac_address, + IFNULL((SELECT value FROM radgroupreply rgr + WHERE rgr.groupname = (SELECT groupname FROM radusergroup rug WHERE rug.username = rc.username LIMIT 1) + AND rgr.attribute = 'Tunnel-Private-Group-Id' LIMIT 1), 'N/A') AS vlan_id, + IFNULL((SELECT value FROM radcheck rch + WHERE rch.username = rc.username AND rch.attribute = 'User-Description' LIMIT 1), 'N/A') AS description + FROM radcheck rc + WHERE rc.username = %s + GROUP BY rc.username; + """, (mac_address,)) + user = cursor.fetchone() + cursor.close() + db.close() + return render_template('edit_user.html', user=user) + return "Database Connection Failed" + +@app.route('/groups') +def groups(): + db = get_db() + if db: + cursor = db.cursor() + try: + # Fetch group names from radgroupcheck + cursor.execute("SELECT DISTINCT groupname FROM radgroupcheck") + group_names = [row[0] for row in cursor.fetchall()] + + grouped_results = {} + for groupname in group_names: + # Fetch attributes for each group from radgroupreply + cursor.execute("SELECT id, attribute, op, value FROM radgroupreply WHERE groupname = %s", (groupname,)) + attributes = cursor.fetchall() + grouped_results[groupname] = [{'id': row[0], 'attribute': row[1], 'op': row[2], 'value': row[3]} for row in attributes] + + cursor.close() + db.close() + return render_template('group_list_nested.html', grouped_results=grouped_results) + except mysql.connector.Error as err: + print(f"Database Error: {err}") + cursor.close() + db.close() + return render_template('group_list_nested.html', grouped_results={}) + return "Database Connection Failed" + +@app.route('/edit_groupname/', methods=['GET', 'POST']) +def edit_groupname(old_groupname): + db = get_db() + if db: + cursor = db.cursor(dictionary=True) + + if request.method == 'POST': + new_groupname = request.form['groupname'] + try: + db.autocommit = False + cursor.execute(""" + UPDATE radgroupreply + SET groupname = %s + WHERE groupname = %s + """, (new_groupname, old_groupname)) + + cursor.execute(""" + UPDATE radusergroup + SET groupname = %s + WHERE groupname = %s + """, (new_groupname, old_groupname)) + + db.commit() + db.autocommit = True + cursor.close() + db.close() + return redirect(url_for('groups')) + except mysql.connector.Error as err: + db.rollback() + db.autocommit = True + cursor.close() + db.close() + return f"Database Error: {err}" + else: + return render_template('edit_groupname.html', old_groupname=old_groupname) + return "Database Connection Failed" + +@app.route('/update_attribute', methods=['POST']) +def update_attribute(): + group_id = request.form['group_id'] + attribute = request.form['attribute'] + op = request.form['op'] + value = request.form['value'] + + db = get_db() + if db: + cursor = db.cursor() + try: + db.autocommit = False + cursor.execute(""" + UPDATE radgroupreply + SET attribute = %s, op = %s, value = %s + WHERE id = %s + """, (attribute, op, value, group_id)) + db.commit() + db.autocommit = True + cursor.close() + return "success" + except mysql.connector.Error as err: + db.rollback() + db.autocommit = True + cursor.close() + return str(err) + except Exception as e: + db.rollback() + db.autocommit = True + cursor.close() + return str(e) + finally: + db.close() + return "Database Connection Failed" + +@app.route('/add_attribute', methods=['POST']) +def add_attribute(): + groupname = request.form['groupname'] + attribute = request.form['attribute'] + op = request.form['op'] + value = request.form['value'] + + db = get_db() + if db: + cursor = db.cursor() + try: + cursor.execute(""" + INSERT INTO radgroupreply (groupname, attribute, op, value) + VALUES (%s, %s, %s, %s) + """, (groupname, attribute, op, value)) + db.commit() + cursor.close() + db.close() + return "success" + except mysql.connector.Error as err: + print(f"Database Error: {err}") + db.rollback() + cursor.close() + db.close() + return str(err) + return "Database Connection Failed" + +@app.route('/edit_attribute/', methods=['GET', 'POST']) +def edit_attribute(group_id): + db = get_db() + if db: + cursor = db.cursor(dictionary=True) + + if request.method == 'POST': + attribute = request.form['attribute'] + op = request.form['op'] + value = request.form['value'] + + try: + db.autocommit = False + cursor.execute(""" + UPDATE radgroupreply + SET attribute = %s, op = %s, value = %s + WHERE id = %s + """, (attribute, op, value, group_id)) + db.commit() + db.autocommit = True + cursor.close() + db.close() + return redirect(url_for('groups')) + except mysql.connector.Error as err: + db.rollback() + db.autocommit = True + cursor.close() + db.close() + return f"Database Error: {err}" + + else: + cursor.execute("SELECT * FROM radgroupreply WHERE id = %s", (group_id,)) + attribute_data = cursor.fetchone() + cursor.close() + db.close() + return render_template('edit_attribute.html', attribute_data=attribute_data) + return "Database Connection Failed" + +@app.route('/add_group', methods=['POST']) +def add_group(): + groupname = request.form['groupname'] + + db = get_db() + if db: + cursor = db.cursor() + try: + cursor.execute("INSERT INTO radgroupreply (groupname, attribute, op, value) VALUES (%s, '', '', '')", (groupname,)) + cursor.execute("INSERT INTO radusergroup (groupname, username) VALUES (%s, '')", (groupname,)) + # Add default values for radgroupcheck + cursor.execute("INSERT INTO radgroupcheck (groupname, attribute, op, value) VALUES (%s, 'Auth-Type', ':=', 'Accept')", (groupname,)) + db.commit() + cursor.close() + db.close() + return "success" + except mysql.connector.Error as err: + print(f"Database Error: {err}") + db.rollback() + cursor.close() + db.close() + return str(err) + return "Database Connection Failed" + +@app.route('/delete_group_rows/') +def delete_group_rows(groupname): + db = get_db() + if db: + cursor = db.cursor() + try: + cursor.execute("DELETE FROM radgroupreply WHERE groupname = %s", (groupname,)) + cursor.execute("DELETE FROM radusergroup WHERE groupname = %s", (groupname,)) + cursor.execute("DELETE FROM radgroupcheck WHERE groupname = %s", (groupname,)) + db.commit() + cursor.close() + db.close() + return redirect(url_for('groups')) + except mysql.connector.Error as err: + print(f"Database Error: {err}") + db.rollback() + cursor.close() + db.close() + return redirect(url_for('groups')) + return "Database Connection Failed" + +@app.route('/delete_group/') +def delete_group(group_id): + db = get_db() + if db: + cursor = db.cursor() + try: + cursor.execute("DELETE FROM radgroupreply WHERE id = %s", (group_id,)) + cursor.execute("DELETE FROM radgroupcheck WHERE id = %s", (group_id,)) # Delete from radgroupcheck + db.commit() + cursor.close() + db.close() + return redirect(url_for('groups')) + except mysql.connector.Error as err: + print(f"Database Error: {err}") + db.rollback() + cursor.close() + db.close() + return redirect(url_for('groups')) + return "Database Connection Failed" + +@app.route('/duplicate_group', methods=['POST']) +def duplicate_group(): + groupname = request.form['groupname'] + db = get_db() + if db: + cursor = db.cursor() + try: + cursor.execute("SELECT attribute, op, value FROM radgroupreply WHERE groupname = %s", (groupname,)) + attributes = [{'attribute': row[0], 'op': row[1], 'value': row[2]} for row in cursor.fetchall()] + cursor.close() + db.close() + return jsonify(attributes) + except mysql.connector.Error as err: + print(f"Database Error: {err}") + cursor.close() + db.close() + return jsonify([]) + return jsonify([]) + +@app.route('/save_duplicated_group', methods=['POST']) +def save_duplicated_group(): + data = json.loads(request.data) + groupname = data['groupname'] + attributes = data['attributes'] + db = get_db() + if db: + cursor = db.cursor() + try: + cursor.execute("INSERT INTO radgroupcheck (groupname, attribute, op, value) VALUES (%s, 'Auth-Type', ':=', 'Accept')", (groupname,)) + cursor.execute("INSERT INTO radusergroup (groupname, username) VALUES (%s, '')", (groupname,)) + for attribute in attributes: + cursor.execute("INSERT INTO radgroupreply (groupname, attribute, op, value) VALUES (%s, %s, %s, %s)", (groupname, attribute['attribute'], attribute['op'], attribute['value'])) + db.commit() + cursor.close() + db.close() + return "success" + except mysql.connector.Error as err: + print(f"Database Error: {err}") + db.rollback() + cursor.close() + db.close() + return str(err) + return "Database Connection Failed" + +@app.route('/add_user', methods=['POST']) +def add_user(): + """Adds a new user to the database.""" + try: + data = request.get_json() # Get the JSON data from the request + mac_address = data.get('mac_address') + description = data.get('description') + vlan_id = data.get('vlan_id') + + if not mac_address: + return jsonify({'success': False, 'message': 'MAC Address is required'}), 400 + + db = get_db() + if db is None: + return jsonify({'success': False, 'message': 'Database connection failed'}), 500 + + cursor = db.cursor() + try: + # Check if user already exists + cursor.execute("SELECT username FROM radcheck WHERE username = %s", (mac_address,)) + if cursor.fetchone(): + cursor.close() + db.close() + return jsonify({'success': False, 'message': 'User with this MAC Address already exists'}), 400 + + # Insert into radcheck, setting password to MAC address + cursor.execute(""" + INSERT INTO radcheck (username, attribute, op, value) + VALUES (%s, 'Cleartext-Password', ':=', %s), + (%s, 'User-Description', ':=', %s) + """, (mac_address, mac_address, mac_address, description)) # Use mac_address for both username and password + + # Insert into radusergroup with the selected group + cursor.execute(""" + INSERT INTO radusergroup (username, groupname) + VALUES (%s, %s) + """, (mac_address, vlan_id)) # Use vlan_id + + db.commit() + cursor.close() + db.close() + return jsonify({'success': True, 'message': 'User added successfully'}) + + except mysql.connector.Error as err: + print(f"Database Error: {err}") + db.rollback() + cursor.close() + db.close() + return jsonify({'success': False, 'message': f"Database error: {err}"}), 500 + + except Exception as e: + print(f"Error adding user: {e}") + db.rollback() + cursor.close() + db.close() + return jsonify({'success': False, 'message': str(e)}), 500 + finally: + db.close() + except Exception as e: + return jsonify({'success': False, 'message': 'Unknown error'}), 500 + + +if __name__ == '__main__': + app.run(debug=True, host='0.0.0.0', port=8080) diff --git a/app/templates/add_user.html b/app/templates/add_user.html index e69de29..7c032c0 100644 --- a/app/templates/add_user.html +++ b/app/templates/add_user.html @@ -0,0 +1,19 @@ + + + + Add User + + +

Add User

+
+ +

+ +

+ +

+ +
+ Back to User List + + \ No newline at end of file diff --git a/app/templates/base.html b/app/templates/base.html new file mode 100644 index 0000000..946c9ec --- /dev/null +++ b/app/templates/base.html @@ -0,0 +1,35 @@ + + + + {% block title %}{% endblock %} + + + + + +
+ {% block content %}{% endblock %} +
+ + \ No newline at end of file diff --git a/app/templates/edit_attribute.html b/app/templates/edit_attribute.html new file mode 100644 index 0000000..509de04 --- /dev/null +++ b/app/templates/edit_attribute.html @@ -0,0 +1,22 @@ + + + + Edit Attribute + + +

Edit Attribute

+ +
+
+

+ +
+

+ +
+

+ + +
+ + \ No newline at end of file diff --git a/app/templates/edit_group.html b/app/templates/edit_group.html new file mode 100644 index 0000000..1567d02 --- /dev/null +++ b/app/templates/edit_group.html @@ -0,0 +1,26 @@ + + + + Edit Group + + +

Edit Group: {{ group.id }}

+ +
+
+

+ +
+

+ +
+

+ +
+

+ + +
+ + + \ No newline at end of file diff --git a/app/templates/edit_groupname.html b/app/templates/edit_groupname.html new file mode 100644 index 0000000..8a04ccf --- /dev/null +++ b/app/templates/edit_groupname.html @@ -0,0 +1,16 @@ + + + + Edit Group Name + + +

Edit Group Name: {{ old_groupname }}

+ +
+
+

+ + +
+ + \ No newline at end of file diff --git a/app/templates/edit_user.html b/app/templates/edit_user.html index e69de29..a2bc268 100644 --- a/app/templates/edit_user.html +++ b/app/templates/edit_user.html @@ -0,0 +1,20 @@ + + + + Edit User + + +

Edit User: {{ user.mac_address }}

+ +
+
+

+ +
+

+ + +
+ + + \ No newline at end of file diff --git a/app/templates/group_list.html b/app/templates/group_list.html new file mode 100644 index 0000000..b97c11d --- /dev/null +++ b/app/templates/group_list.html @@ -0,0 +1,38 @@ + + + + Group List + + +

Group List

+ + + + + + + + + + + + + + {% for group in results %} + + + + + + + + + {% endfor %} + +
IDGroup NameAttributeOpValueActions
{{ group.id }}{{ group.groupname }}{{ group.attribute }}{{ group.op }}{{ group.value }} + Edit | + Delete +
+ + + \ No newline at end of file diff --git a/app/templates/group_list_nested.html b/app/templates/group_list_nested.html new file mode 100644 index 0000000..1aeb72c --- /dev/null +++ b/app/templates/group_list_nested.html @@ -0,0 +1,364 @@ +{% extends 'base.html' %} + +{% block title %}Group List{% endblock %} + +{% block content %} +

Group List

+ + {% for groupname, attributes in grouped_results.items() %} + + + + + + + + + + + + + + + + + {% for attribute in attributes %} + + + + + + + + {% endfor %} + +
Group NameAttributesOpValueActions
+ + + + + + + 🗑️ + +
+ + + + + 🗑️ +
+ {% endfor %} + + + + + + + + + + + + + + + + + + +
Group NameAttributesOpValueActions
+ + + +
+ + +
+ + + + + + + +{% endblock %} \ No newline at end of file diff --git a/app/templates/index.html b/app/templates/index.html new file mode 100644 index 0000000..5c94a9d --- /dev/null +++ b/app/templates/index.html @@ -0,0 +1,43 @@ +{% extends 'base.html' %} + +{% block title %}FreeRADIUS Manager{% endblock %} + +{% block content %} +

FreeRADIUS Manager

+ +

Statistics:

+

Total Users: {{ total_users }}

+

Total Groups: {{ total_groups }}

+ +

SQL Query Tool:

+
+
+ +
+ + {% if sql_results %} +

Query Results:

+ + + + {% for key in sql_results[0].keys() %} + + {% endfor %} + + + + {% for row in sql_results %} + + {% for value in row.values() %} + + {% endfor %} + + {% endfor %} + +
{{ key }}
{{ value }}
+ {% endif %} + + {% if sql_error %} +

{{ sql_error }}

+ {% endif %} +{% endblock %} \ No newline at end of file diff --git a/app/templates/user_list.html b/app/templates/user_list.html index e69de29..95ec148 100644 --- a/app/templates/user_list.html +++ b/app/templates/user_list.html @@ -0,0 +1,364 @@ +{% extends 'base.html' %} + +{% block title %}User List{% endblock %} + +{% block content %} +

User List

+ + {% for username, attributes in grouped_users.items() %} + + + + + + + + + + + + + + + + + {% for attribute in attributes %} + + + + + + + + {% endfor %} + +
User NameAttributesOpValueActions
+ + + + + + + 🗑️ + +
+ + + + + 🗑️ +
+ {% endfor %} + + + + + + + + + + + + + + + + + + +
User NameAttributesOpValueActions
+ + + +
+ + +
+ + + + + + + +{% endblock %} \ No newline at end of file diff --git a/app/templates/user_list_inline_edit.html b/app/templates/user_list_inline_edit.html new file mode 100644 index 0000000..b7dc45b --- /dev/null +++ b/app/templates/user_list_inline_edit.html @@ -0,0 +1,316 @@ +{% extends 'base.html' %} + +{% block title %}User List{% endblock %} + +{% block content %} +

User List

+ + + + + + + + + + + + {% for user in results %} + + + + + + + {% endfor %} + + + + +
MAC AddressDescriptionVLAN IDActions
+ + + 🗑️ + +
+ +
+ + +
+ + + + + + + + + + + + + + + +
MAC AddressDescriptionVLAN ID
+
+
+ + +
+ + + +
+ + + + + + + +{% endblock %} diff --git a/db-data/aria_log.00000001 b/db-data/aria_log.00000001 index 1d17e89445a80fc25d5e46efdf9db7a1737bc563..c2d0dcec15c2f48566f2662af6a66e67a0a825b9 100644 GIT binary patch delta 1137 zcmYk&cT^5w6vy!%MI|NmW@blrvUizfmc3J382lN_I06V{JQJA6BqlS3AcC37G^PVHn8_?cn9UsKqM65h zLJ4C53t7Zsmar5f;Vff0D_F@YRujP**0PTEY+xgsh$M>5Y+)hdkmjPk72R(s<4bUh<09yx}eByyHC|_{b+d^Mwq)@{RBO;3vPx3{hGs zolR*|rOlMiu5=Ei&6T!L+EVG9N?R$NOKEGRZIsTfw5`&4l(tjaUd0+zY+^)MqCr{O z#QwP^CYk>ypHT&-IAlqhl%i4$Nh0Gc#a)Vv6hA37rG!gylM*k*LrS_7FDZ`6qFZMv zo>F|I_)GDXvPQ}XDG5>nq-0155@PL?BDxt}{TAiTdbPKNP!X}2B*iEtN=k&3%Tgkx Zn52pV(NZc%+5b2p|+ddqK>-isjq>CZgrbXw`=4M zjWy9!GtJ%UE-l>c9xb)fS{wIj>ptz=?*Z*~&`~E3ddR~%dqfvqb<?uPG^|WUU^Q`AQFH5%JMtA`ujq;)#qm40EG|qSvOf<<$UN+ej zub66@>0b4k8D@Ij8)lhpj=AP}(_7v)-vaMg=w0twWU==xvD7llt?+>ledJ>+t&-~# ztF5utr#`dJ=hoX`qfIvZ!k51CwJpA})i&Gh@U8EBZ>L>$`@tSR+H0Tv4mjwL!;U!W znB#u(vlC7_{O%8b`pe(`@vr~Y^SOk9k%2+yk_aP^V%QEM7#ILpLYvb<&nBLl;Pb0UmDih&z=DAR01_wyQUCw| literal 0 HcmV?d00001 diff --git a/db-data/ib_logfile0 b/db-data/ib_logfile0 index ced8752cbfe78c2473692bd18bd0ea2837ca264a..2ce432356aa0e88fc97c545c9506fb575faba231 100644 GIT binary patch delta 7820 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 delta 7543 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 diff --git a/docker-compose.yml b/docker-compose.yml index aff64bd..2226796 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -version: '3.8' +--- services: app: @@ -10,8 +10,7 @@ services: environment: - FLASK_APP=app.py - FLASK_ENV=development - depends_on: - - db + nginx: build: context: ./nginx @@ -19,13 +18,4 @@ services: ports: - "8080:80" depends_on: - - app - db: - image: mariadb:10.6 - environment: - MYSQL_ROOT_PASSWORD: your_root_password - MYSQL_DATABASE: radius - MYSQL_USER: radiususer - MYSQL_PASSWORD: radiuspassword - volumes: - - ./db-data:/var/lib/mysql # persistant data. \ No newline at end of file + - app \ No newline at end of file diff --git a/nginx/nginx.conf b/nginx/nginx.conf index 552c98f..3a61666 100644 --- a/nginx/nginx.conf +++ b/nginx/nginx.conf @@ -6,7 +6,7 @@ http { server_name localhost; location / { - proxy_pass http://app:5000; + proxy_pass http://app:8080; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;