cbfd166b15
* Package scripts that are shipped by upstream in their binary download
* Includes setup scripts (setup-seafile.sh to use SQLite,
setup-seafile-mysql.{sh,py} to use MySQL) and control scripts
(seafile.sh, seahub.sh)
* Does not include seafile-admin, which is not shipped in upstream's
binary download. Combined with the fact that it hasn't been updated
to Python 3 suggests the script has been abandoned.
* Replace previous init scripts with a simplified script
* Previous init scripts (seafile.init, seahub.init) were modified from
older versions of seafile.sh and seahub.sh, but they haven't kept up
with changes to upstream's scripts
* New init script (seafile-server.init) start/stops both Seafile and
Seahub (there is no need to control them separately) by calling
upstream's control scripts
* Replace previous package config file with new config file
* Options in previous config file (seafile.conf) were mainly for using
Seahub in FastCGI mode. FastCGI was deprecated in Django 1.7 and
removed in 1.9; upstream's control script will only start Seahub
using Gunicorn. (Options for Gunicorn including port number can be
changed by editing /etc/seafile/conf/gunicorn.conf.py.)
* New config file (seafile-server.config) has one option that controls
where the Seafile/Seahub data directories are stored
* Patch scripts/binaries to use standard, system-wide directory
locations
* Script files (wrappers for binaries) in /usr/bin
* Binaries (not meant to be run directly by the user) in /usr/libexec
* Config files in /etc/seafile
* Pid/socket files in /var/run/seafile
* Logs in /var/log/seafile
* Include a new script to create the first admin account
* With upstream's original scripts, the user is required to
interactively create the first admin account when Seahub is started
for the first time
* The user will now use the new script (create-seafile-admin.sh) to
create the first admin account after setup (using setup-seafile.sh
or setup-seafile-mysql.sh) and before starting Seafile/Seahub
* seahub.sh is patched to only check if there is at least one admin
account and exit with an error if there is no admin account
* Remove build config options and add seafile-server-fuse package
* The console option controls whether the console window is shown when
Seafile server is run on Windows. It has no use on Linux.
* The fuse option controls whether seaf-fuse is built. (seaf-fuse is a
FUSE implementation that allows the Seafile database/file system to
be mounted to a local directory.) seaf-fuse is now always built and
is available in a separate package (seafile-server-fuse).
* Add myself as a maintainer
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
56 lines
1.9 KiB
Diff
56 lines
1.9 KiB
Diff
--- a/scripts/check_init_admin.py
|
|
+++ b/scripts/check_init_admin.py
|
|
@@ -310,7 +310,7 @@ def create_admin(email, passwd):
|
|
def ask_admin_email():
|
|
print()
|
|
print('----------------------------------------')
|
|
- print('It\'s the first time you start the seafile server. Now let\'s create the admin account')
|
|
+ print('Let\'s create the admin account')
|
|
print('----------------------------------------')
|
|
def validate(email):
|
|
# whitespace is not allowed
|
|
@@ -350,8 +350,15 @@ def ask_admin_password():
|
|
|
|
rpc = RPC()
|
|
|
|
-def main():
|
|
+def main(argv):
|
|
+ if len(argv) > 1 and argv[1] == 'has-admin':
|
|
+ sys.exit(1 if need_create_admin() else 0)
|
|
+
|
|
if not need_create_admin():
|
|
+ print('')
|
|
+ print('A seafile admin account already exists.')
|
|
+ print('Log into seahub to add additional accounts.')
|
|
+ print('If you cannot log in, run reset-seafile-admin to add a new admin account.')
|
|
return
|
|
|
|
password_file = os.path.join(os.environ['SEAFILE_CENTRAL_CONF_DIR'], 'admin.txt')
|
|
@@ -369,7 +376,7 @@ def main():
|
|
|
|
if __name__ == '__main__':
|
|
try:
|
|
- main()
|
|
+ main(sys.argv)
|
|
except KeyboardInterrupt:
|
|
print('\n\n\n')
|
|
print(Utils.highlight('Aborted.'))
|
|
@@ -379,3 +386,4 @@ if __name__ == '__main__':
|
|
print()
|
|
print(Utils.highlight('Error happened during creating seafile admin.'))
|
|
print()
|
|
+ sys.exit(1)
|
|
--- a/scripts/seahub.sh
|
|
+++ b/scripts/seahub.sh
|
|
@@ -250,7 +250,10 @@ function stop_seahub () {
|
|
|
|
function check_init_admin() {
|
|
check_init_admin_script=${INSTALLPATH}/check_init_admin.py
|
|
- if ! $PYTHON $check_init_admin_script; then
|
|
+ if ! $PYTHON $check_init_admin_script has-admin; then
|
|
+ echo "Error: there is no seafile admin account."
|
|
+ echo "Have you run create-seafile-admin before this?"
|
|
+ echo ""
|
|
exit 1
|
|
fi
|
|
}
|