mirror of
https://gitlab2.federez.net/re2o/re2o
synced 2024-12-23 07:23:46 +00:00
premier essai
This commit is contained in:
parent
810568411a
commit
a32281e721
4 changed files with 53 additions and 0 deletions
4
.vscode/settings.json
vendored
Normal file
4
.vscode/settings.json
vendored
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
{
|
||||||
|
"editor.detectIndentation": false,
|
||||||
|
"editor.tabSize": 4
|
||||||
|
}
|
|
@ -7,7 +7,11 @@ cp -n cotisations/templates/cotisations/voucher.html templates/default_voucher.h
|
||||||
AUTOMIGRATE=${AUTOMIGRATE:-yes}
|
AUTOMIGRATE=${AUTOMIGRATE:-yes}
|
||||||
|
|
||||||
if [ "$AUTOMIGRATE" != "skip" ]; then
|
if [ "$AUTOMIGRATE" != "skip" ]; then
|
||||||
|
<<<<<<< HEAD
|
||||||
poetry run python manage.py migrate --noinput
|
poetry run python manage.py migrate --noinput
|
||||||
|
=======
|
||||||
|
poetry run python3 manage.py migrate --noinput
|
||||||
|
>>>>>>> a62566ef (premier essai)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
poetry run python manage.py collectstatic
|
poetry run python manage.py collectstatic
|
||||||
|
|
41
ldap_sync/migrations/0002_delete.py
Normal file
41
ldap_sync/migrations/0002_delete.py
Normal file
|
@ -0,0 +1,41 @@
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
# Generated by Django 1.11.29 on 2021-01-10 16:59
|
||||||
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
|
from django.db import migrations
|
||||||
|
#from django.conf import settings
|
||||||
|
import ldapdb.models.fields
|
||||||
|
|
||||||
|
#from ldap_sync.management.commands.ldap_rebuild import flush_ldap, sync_ldap
|
||||||
|
|
||||||
|
#def rebuild_ldap(apps, schema_editor):
|
||||||
|
# usersdn = settings.LDAP["base_user_dn"]
|
||||||
|
# groupsdn = settings.LDAP["base_usergroup_dn"]
|
||||||
|
# binddn = settings.DATABASES["ldap"]["USER"]
|
||||||
|
# bindpass = settings.DATABASES["ldap"]["PASSWORD"]
|
||||||
|
# server = settings.DATABASES["ldap"]["NAME"]
|
||||||
|
# flush_ldap(binddn, bindpass, server, usersdn, groupsdn)
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
initial = True
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('ldap_sync', '0001_initial')
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.DeleteModel(
|
||||||
|
name='LdapServiceUser',
|
||||||
|
),
|
||||||
|
migrations.DeleteModel(
|
||||||
|
name='LdapServiceUserGroup',
|
||||||
|
),
|
||||||
|
migrations.DeleteModel(
|
||||||
|
name='LdapUser',
|
||||||
|
),
|
||||||
|
migrations.DeleteModel(
|
||||||
|
name='LdapUserGroup',
|
||||||
|
),
|
||||||
|
]
|
4
poetry.lock
generated
4
poetry.lock
generated
|
@ -2165,4 +2165,8 @@ postgresql = ["psycopg2"]
|
||||||
[metadata]
|
[metadata]
|
||||||
lock-version = "2.0"
|
lock-version = "2.0"
|
||||||
python-versions = ">=3.8,<4.0"
|
python-versions = ">=3.8,<4.0"
|
||||||
|
<<<<<<< HEAD
|
||||||
content-hash = "35c7fcf4285d44bb7287cb8d9573f327beec53c61979faae77a8c077c2560930"
|
content-hash = "35c7fcf4285d44bb7287cb8d9573f327beec53c61979faae77a8c077c2560930"
|
||||||
|
=======
|
||||||
|
content-hash = "2ee7b73659d0ea743ca62e05d7dd39be39a3f8cbb61688aa0e58bd728c3e21ce"
|
||||||
|
>>>>>>> db0c57af (premier essai)
|
||||||
|
|
Loading…
Reference in a new issue