forked from 0x2620/pandora
install fixes
This commit is contained in:
parent
139511c3fe
commit
e99d59c0df
3 changed files with 12 additions and 2 deletions
|
@ -11,6 +11,16 @@ class Migration(migrations.Migration):
|
||||||
]
|
]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='user',
|
||||||
|
name='password',
|
||||||
|
field=models.CharField(max_length=255, verbose_name='password'),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='user',
|
||||||
|
name='last_name',
|
||||||
|
fields=models.CharField(blank=True, max_length=30, verbose_name='last name'),
|
||||||
|
),
|
||||||
migrations.AlterField(
|
migrations.AlterField(
|
||||||
model_name='user',
|
model_name='user',
|
||||||
name='email',
|
name='email',
|
||||||
|
|
|
@ -304,7 +304,7 @@ if __name__ == "__main__":
|
||||||
development = branch == 'master'
|
development = branch == 'master'
|
||||||
elif len(sys.argv) == 3 and sys.argv[1] == 'switch':
|
elif len(sys.argv) == 3 and sys.argv[1] == 'switch':
|
||||||
branch = sys.argv[2]
|
branch = sys.argv[2]
|
||||||
development = False
|
development = branch == 'master'
|
||||||
else:
|
else:
|
||||||
branch = 'master'
|
branch = 'master'
|
||||||
development = True
|
development = True
|
||||||
|
|
|
@ -197,7 +197,7 @@ fi
|
||||||
if [ "$NGINX" == "local" ]; then
|
if [ "$NGINX" == "local" ]; then
|
||||||
|
|
||||||
cp "/srv/pandora/etc/nginx/pandora" "/etc/nginx/sites-available/pandora"
|
cp "/srv/pandora/etc/nginx/pandora" "/etc/nginx/sites-available/pandora"
|
||||||
rm /etc/nginx/sites-enabled/default
|
rm -f /etc/nginx/sites-enabled/default
|
||||||
ln -s ../sites-available/pandora /etc/nginx/sites-enabled/pandora
|
ln -s ../sites-available/pandora /etc/nginx/sites-enabled/pandora
|
||||||
|
|
||||||
read -r -d '' GZIP <<EOI
|
read -r -d '' GZIP <<EOI
|
||||||
|
|
Loading…
Reference in a new issue