Compare commits
No commits in common. "e99d59c0df97df453e849dea67c9ae9155d8dbfd" and "b889159b801140a228a1434e7f2cbaec6eacf1a4" have entirely different histories.
e99d59c0df
...
b889159b80
5 changed files with 4 additions and 14 deletions
|
|
@ -16,7 +16,7 @@
|
||||||
cd /root
|
cd /root
|
||||||
curl -sL https://pan.do/ra-install > pandora_install.sh
|
curl -sL https://pan.do/ra-install > pandora_install.sh
|
||||||
chmod +x pandora_install.sh
|
chmod +x pandora_install.sh
|
||||||
export BRANCH=stable # change to 'master' to get current developement version
|
BRANCH=stable # change to 'master' to get current developement version
|
||||||
./pandora_install.sh 2>&1 | tee pandora_install.log
|
./pandora_install.sh 2>&1 | tee pandora_install.log
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -11,16 +11,6 @@ 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 = branch == 'master'
|
development = False
|
||||||
else:
|
else:
|
||||||
branch = 'master'
|
branch = 'master'
|
||||||
development = True
|
development = True
|
||||||
|
|
|
||||||
|
|
@ -41,6 +41,6 @@
|
||||||
cd /root
|
cd /root
|
||||||
curl -sL https://pan.do/ra-install > pandora_install.sh
|
curl -sL https://pan.do/ra-install > pandora_install.sh
|
||||||
chmod +x pandora_install.sh
|
chmod +x pandora_install.sh
|
||||||
export BRANCH=stable # or master
|
BRANCH=stable # or master
|
||||||
./pandora_install.sh 2>&1 | tee pandora_install.log
|
./pandora_install.sh 2>&1 | tee pandora_install.log
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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 -f /etc/nginx/sites-enabled/default
|
rm /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…
Add table
Add a link
Reference in a new issue