diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-07-16 20:10:57 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-07-16 20:10:57 +0200 |
commit | d4119bdffd893943263a82813f6b783fda0253dd (patch) | |
tree | 8e2be9071d39542da68661a27bc402874314798a /install | |
parent | a39f989e9c02bca9e4c3127fde855364f392e3a5 (diff) | |
parent | 5e7cda4fe8902979dac8a8008908accb8f0bfab4 (diff) | |
download | Ishtar-d4119bdffd893943263a82813f6b783fda0253dd.tar.bz2 Ishtar-d4119bdffd893943263a82813f6b783fda0253dd.zip |
Merge branch 'master' into v0.9
Conflicts:
install/install.sh
Diffstat (limited to 'install')
-rwxr-xr-x | install/install.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/install/install.sh b/install/install.sh index 4ef5d8441..e80730f9d 100755 --- a/install/install.sh +++ b/install/install.sh @@ -170,7 +170,8 @@ sed -s "s|#APP_NAME#|$APP_NAME|g;\ ln -s $INSTALL_PATH'/conf/local_settings.py' $APP_DIR'/local_settings.py' # rights -mkdir -p $APP_DIR'/media' +mkdir -p "$APP_DIR/media/imported" +mkdir -p "$APP_DIR/media/upload" chown -R root:www-data $APP_DIR'/media' chmod -R g+w $APP_DIR'/media' |