YunoHost-Apps/pyinventory_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/pyinventory_ynh.git synced 2024-09-03 20:16:09 +02:00
Code Issues Activity Actions 2

Bugfix update superuser

Browse source 
The "update superuser" part in "scripts/upgrade" doesn't work. Because it tries to create a new
superuser and doesn't handle a existing one.

We have conf/create_superuser.py that handle this: Use it in install/upgrade
This commit is contained in:
JensDiemer 2020-12-09 20:24:36 +01:00
parent 9d0a5b1bbb
commit 76785f5f78
3 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
conf/create_superuser.py
View file

@ -11,10 +11,12 @@ def main():
description='Create or update Django super user.' description='Create or update Django super user.'
) )
parser.add_argument('--username') parser.add_argument('--username')
parser.add_argument('--email')
parser.add_argument('--password') parser.add_argument('--password')
args = parser.parse_args() args = parser.parse_args()
username = args.username username = args.username
email = args.email or ''
password = args.password password = args.password
import django import django
@ -26,12 +28,13 @@ def main():
if super_user: if super_user:
print('Update existing super user and set his password.', file=sys.stderr) print('Update existing super user and set his password.', file=sys.stderr)
super_user.set_password(password) super_user.set_password(password)
super_user.email=email
super_user.save() super_user.save()
else: else:
print('Create new super user', file=sys.stderr) print('Create new super user', file=sys.stderr)
User.objects.create_superuser( User.objects.create_superuser(
username=username, username=username,
email='', email=email,
password=password password=password
) )

5
scripts/install
View file

@ -120,6 +120,9 @@ chown -R "$app" "$final_path"
# ================================================ # ================================================
ynh_script_progression --message="Create pyinventory configuration file..." ynh_script_progression --message="Create pyinventory configuration file..."
cp ../conf/create_superuser.py "$final_path/create_superuser.py"
chmod +x "$final_path/create_superuser.py"
gunicorn_conf="$final_path/gunicorn.conf.py" gunicorn_conf="$final_path/gunicorn.conf.py"
cp "../conf/gunicorn.conf.py" "$gunicorn_conf" cp "../conf/gunicorn.conf.py" "$gunicorn_conf"
ynh_replace_string --match_string="__FINAL_HOME_PATH__" --replace_string="$final_path" --target_file="$gunicorn_conf" ynh_replace_string --match_string="__FINAL_HOME_PATH__" --replace_string="$final_path" --target_file="$gunicorn_conf"
@ -171,7 +174,7 @@ ynh_script_progression --message="migrate/collectstatic/createadmin..." --weight
./manage.py migrate --no-input ./manage.py migrate --no-input
./manage.py collectstatic --no-input ./manage.py collectstatic --no-input
echo "from django.contrib.auth import get_user_model; get_user_model().objects.create_superuser('$admin', '$admin_mail', 'pyinventory')" | ./manage.py shell ./create_superuser.py --username="$admin" --email="$admin_mail" --password="pyinventory"
# Check the configuration # Check the configuration
# This may fail in some cases with errors, etc., but the app works and the user can fix issues later. # This may fail in some cases with errors, etc., but the app works and the user can fix issues later.

6
scripts/upgrade
View file

@ -105,6 +105,10 @@ chown -R "$app" "$final_path"
# ================================================ # ================================================
ynh_script_progression --message="Create pyinventory configuration file..." ynh_script_progression --message="Create pyinventory configuration file..."
ynh_backup_if_checksum_is_different --file="$final_path/create_superuser.py"
cp ../conf/create_superuser.py "$final_path/create_superuser.py"
chmod +x "$final_path/create_superuser.py"
gunicorn_conf="$final_path/gunicorn.conf.py" gunicorn_conf="$final_path/gunicorn.conf.py"
ynh_backup_if_checksum_is_different --file="$gunicorn_conf" ynh_backup_if_checksum_is_different --file="$gunicorn_conf"
cp "../conf/gunicorn.conf.py" "$gunicorn_conf" cp "../conf/gunicorn.conf.py" "$gunicorn_conf"
@ -160,7 +164,7 @@ ynh_script_progression --message="migrate/collectstatic/createadmin..." --weight
./manage.py migrate --no-input ./manage.py migrate --no-input
./manage.py collectstatic --no-input ./manage.py collectstatic --no-input
echo "from django.contrib.auth import get_user_model; get_user_model().objects.create_superuser('$admin', '$admin_mail', 'pyinventory')" | ./manage.py shell ./create_superuser.py --username="$admin" --email="$admin_mail" --password="pyinventory"
# Check the configuration # Check the configuration
# This may fail in some cases with errors, etc., but the app works and the user can fix issues later. # This may fail in some cases with errors, etc., but the app works and the user can fix issues later.