Imported Debian patch 3.0.1-2
This commit is contained in:
parent
d6fb99058d
commit
a9e312c781
2
debian/apache.conf
vendored
2
debian/apache.conf
vendored
@ -1,4 +1,4 @@
|
|||||||
#Alias /gallery3 /usr/share/gallery3
|
Alias /gallery3 /usr/share/gallery3
|
||||||
|
|
||||||
<Directory /usr/share/gallery3>
|
<Directory /usr/share/gallery3>
|
||||||
Options FollowSymLinks
|
Options FollowSymLinks
|
||||||
|
7
debian/changelog
vendored
7
debian/changelog
vendored
@ -1,3 +1,10 @@
|
|||||||
|
gallery3 (3.0.1-2) unstable; urgency=low
|
||||||
|
|
||||||
|
* debian/{links,rules}: set data directory to /var/lib/gallery3
|
||||||
|
* Auto setup gallery3
|
||||||
|
|
||||||
|
-- Michael C. Schultheiss <schultmc@debian.org> Fri, 28 Jan 2011 22:00:48 +0000
|
||||||
|
|
||||||
gallery3 (3.0.1-1) unstable; urgency=low
|
gallery3 (3.0.1-1) unstable; urgency=low
|
||||||
|
|
||||||
* New upstream release
|
* New upstream release
|
||||||
|
2
debian/config
vendored
2
debian/config
vendored
@ -14,4 +14,6 @@ db_version 2.0 || [ 0 -lt 30 ]
|
|||||||
|
|
||||||
db_input high gallery3/webserver_type || true
|
db_input high gallery3/webserver_type || true
|
||||||
|
|
||||||
|
db_input high gallery3/admin-password || true
|
||||||
|
|
||||||
db_go || true
|
db_go || true
|
||||||
|
2
debian/links
vendored
2
debian/links
vendored
@ -1 +1 @@
|
|||||||
var/lib/gallery3/g3data usr/share/gallery3/var
|
var/lib/gallery3 usr/share/gallery3/var
|
||||||
|
6
debian/make_password.php
vendored
Normal file
6
debian/make_password.php
vendored
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
<?
|
||||||
|
define(SYSPATH, 1);
|
||||||
|
include("/usr/share/gallery3/modules/user/lib/PasswordHash.php");
|
||||||
|
$hash_generator = new PasswordHash(10, true);
|
||||||
|
echo $hash_generator->HashPassword($_SERVER["argv"][1]), "\n";
|
||||||
|
?>
|
14
debian/postinst
vendored
14
debian/postinst
vendored
@ -13,6 +13,10 @@ if ! dbc_go gallery3 $@ ; then
|
|||||||
echo 'Automatic configuration using dbconfig-common failed!'
|
echo 'Automatic configuration using dbconfig-common failed!'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ -z $dbc_dbserver ]; then
|
||||||
|
dbc_dbserver="localhost"
|
||||||
|
fi
|
||||||
|
|
||||||
if [ "$DPKG_DEBUG" = "developer" ]; then
|
if [ "$DPKG_DEBUG" = "developer" ]; then
|
||||||
set -x
|
set -x
|
||||||
fi
|
fi
|
||||||
@ -20,6 +24,16 @@ fi
|
|||||||
case "$1" in
|
case "$1" in
|
||||||
configure)
|
configure)
|
||||||
|
|
||||||
|
if [ ! -f /var/lib/gallery3/database.php ]; then
|
||||||
|
php /usr/share/gallery3/installer/index.php -h $dbc_dbserver -u $dbc_dbuser -p $dbc_dbpass -d $dbc_dbname
|
||||||
|
fi
|
||||||
|
|
||||||
|
db_get gallery3/admin-password
|
||||||
|
g3_admin_passwd="$RET"
|
||||||
|
export g3_admin_passwd
|
||||||
|
g3_admin_passwd_hash=$(php /usr/share/gallery3/make_password.php $g3_admin_passwd)
|
||||||
|
mysql -u$dbc_dbuser -p$dbc_dbpass -e "update users set password='$g3_admin_passwd_hash' where id=2" $dbc_dbname
|
||||||
|
|
||||||
db_get gallery3/webserver_type
|
db_get gallery3/webserver_type
|
||||||
webservers="$RET"
|
webservers="$RET"
|
||||||
restart=""
|
restart=""
|
||||||
|
3
debian/rules
vendored
3
debian/rules
vendored
@ -6,7 +6,7 @@
|
|||||||
DESTDIR=$(CURDIR)/debian/gallery3
|
DESTDIR=$(CURDIR)/debian/gallery3
|
||||||
GDIR=$(DESTDIR)/usr/share/gallery3
|
GDIR=$(DESTDIR)/usr/share/gallery3
|
||||||
GCONFDIR=$(DESTDIR)/etc/gallery3
|
GCONFDIR=$(DESTDIR)/etc/gallery3
|
||||||
GDATADIR=$(DESTDIR)/var/lib/gallery3/g3data
|
GDATADIR=$(DESTDIR)/var/lib/gallery3
|
||||||
DOCDIR=$(DESTDIR)/usr/share/doc/gallery3
|
DOCDIR=$(DESTDIR)/usr/share/doc/gallery3
|
||||||
|
|
||||||
|
|
||||||
@ -41,6 +41,7 @@ install:
|
|||||||
fi \
|
fi \
|
||||||
done
|
done
|
||||||
install -m 644 debian/apache.conf $(GCONFDIR)
|
install -m 644 debian/apache.conf $(GCONFDIR)
|
||||||
|
install -m 644 debian/make_password.php $(GDIR)
|
||||||
|
|
||||||
build:
|
build:
|
||||||
# Build architecture-dependent files here.
|
# Build architecture-dependent files here.
|
||||||
|
12
debian/templates
vendored
12
debian/templates
vendored
@ -14,3 +14,15 @@ _Description: Should ${webserver} be restarted?
|
|||||||
Remember that in order to activate the new configuration, ${webserver} has
|
Remember that in order to activate the new configuration, ${webserver} has
|
||||||
to be restarted. You can also restart ${webserver} by manually executing
|
to be restarted. You can also restart ${webserver} by manually executing
|
||||||
'invoke-rc.d ${webserver} restart'.
|
'invoke-rc.d ${webserver} restart'.
|
||||||
|
|
||||||
|
Template: gallery3/admin-password
|
||||||
|
Type: password
|
||||||
|
Default:
|
||||||
|
_Description: Password for Gallery 3 admin user
|
||||||
|
Gallery 3 may be accessed, after installation, from
|
||||||
|
http://localhost/gallery3/
|
||||||
|
.
|
||||||
|
Administrative access to Gallery 3 requires identification with a
|
||||||
|
username and a password.
|
||||||
|
.
|
||||||
|
The default username is admin and the password is whatever you set here.
|
||||||
|
Reference in New Issue
Block a user