diff --git a/.gitignore b/.gitignore index 0f7950e3..ed2949d8 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,7 @@ gacl.ini.php .settings .settings/* */templates_c/* -img/* +img/*tif display/templates_c/* clear_templates_c.sh test/* diff --git a/img/.htaccess b/img/.htaccess new file mode 100644 index 00000000..27acba1a --- /dev/null +++ b/img/.htaccess @@ -0,0 +1,2 @@ +order deny,all +deny from all diff --git a/install/pgsql/alter-2.2-2.3.sql b/install/pgsql/alter-2.2-2.3.sql index 0f72e811..53117d54 100644 --- a/install/pgsql/alter-2.2-2.3.sql +++ b/install/pgsql/alter-2.2-2.3.sql @@ -36,9 +36,6 @@ ALTER table otolithe.piece add column uuid uuid default gen_random_uuid(); COMMENT ON COLUMN otolithe.photolecture.commentaire IS E'Commentaire sur la lecture'; -- ddl-end -- -ALTER TABLE otolithe.metadatatype ALTER COLUMN is_array SET DEFAULT f; --- ddl-end -- - -- [ Created constraints ] -- -- object: logingestion_pk | type: CONSTRAINT -- diff --git a/install/upgrade-2.2-2.3.0.sh b/install/upgrade-2.2-2.3.0.sh index 655b8b0b..451785b2 100644 --- a/install/upgrade-2.2-2.3.0.sh +++ b/install/upgrade-2.2-2.3.0.sh @@ -27,10 +27,10 @@ cp otolithe/param/param.inc.php $VERSION/param/ chgrp www-data $VERSION/param/param.inc.php # keys for tokens -if [ -e otolithe/param/otolithe ] +if [ -e otolithe/param/id_otolithe ] then -cp otolithe/param/otolithe* $VERSION/param/ -chown www-data $VERSION/param/otolithe +cp otolithe/param/id_otolithe* $VERSION/param/ +chown www-data $VERSION/param/id_otolithe fi #replacement of symbolic link @@ -47,12 +47,13 @@ chmod 750 /var/www/html/otolithe # assign rights to new folder mkdir $VERSION/display/templates_c +mkdir img/ chmod -R 750 $VERSION chgrp -R www-data $VERSION # update rights to specific software folders chmod -R 770 $VERSION/display/templates_c -chmod -R 770 $VERSION/temp +chmod -R 770 $VERSION/img # update php.ini file PHPVER=`php -v|head -n 1|cut -c 5-7` PHPINIFILE="/etc/php/$PHPVER/apache2/php.ini"