seafile: create config file in a more elegant way

diff --git a/net/seafile-server/Makefile b/net/seafile-server/Makefile
index 93ac450ffa6e260cae6154fcde5df8abcf6c845f..8e354165699c5499815bc31b08aa2e7d5d331ff4 100644 (file)
--- a/net/seafile-server/Makefile
+++ b/net/seafile-server/Makefile
@@ -40,6 +40,10 @@ define Package/seafile-server/description
    Open source cloud storage with advanced features on privacy protection and teamwork.
 endef
 
+define Package/seafile-server/conffiles
+/etc/config/seafile
+endef
+
 CONFIGURE_ARGS += --disable-riak \
                    --disable-client \
                    --disable-fuse \
@@ -60,6 +64,7 @@ define Package/seafile-server/install
        $(INSTALL_DIR) $(1)/usr/lib/python2.7/site-packages
        $(INSTALL_DIR) $(1)/usr/share/seafile/seafile-server/runtime
        $(INSTALL_DIR) $(1)/etc/init.d
+       $(INSTALL_DIR) $(1)/etc/config
        $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/python2.7/site-packages/seafile/ $(1)/usr/lib/python2.7/site-packages/
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/python2.7/site-packages/seaserv/ $(1)/usr/lib/python2.7/site-packages/
@@ -71,6 +76,7 @@ define Package/seafile-server/install
        $(CP) $(PKG_BUILD_DIR)/scripts/sqlite2mysql.sh $(1)/usr/share/seafile/seafile-server/
        $(CP) $(PKG_BUILD_DIR)/scripts/upgrade/ $(1)/usr/share/seafile/seafile-server/
        $(INSTALL_BIN) ./files/seafile.init $(1)/etc/init.d/seafile
+       $(CP) ./files/seafile.conf $(1)/etc/config/seafile
 endef
 
 define Build/InstallDev
@@ -90,13 +96,6 @@ if ! id -u seafile >/dev/null 2>&1; then
 chown -R seafile:seafile /usr/share/seafile/
 chmod -R o-rwx /usr/share/seafile/
 
-if [ ! -f /etc/config/seafile ]; then
-cat <<EOF > /etc/config/seafile
-# Start Seahub in fastcgi mode - 1 = enable, 0 = disable
-SEAHUB_FASTCGI=0
-EOF
-fi
-
 if [ ! -d "/usr/share/seafile/seafile-data" ]
 then
    echo "*** Installation completed, running configuration script..."

diff --git a/net/seafile-server/files/seafile.init b/net/seafile-server/files/seafile.init
index 819807b16c9ce008aaa34e6e22fedccfa586831e..42f98e2d9a967b5d0c69cfd2c3bc7b04fa0542b1 100755 (executable)
--- a/net/seafile-server/files/seafile.init
+++ b/net/seafile-server/files/seafile.init
@@ -6,6 +6,7 @@ EXTRA_HELP="    setup   Runs the setup script
        create_admin    Creates the administrative login
        reset_admin     Alias to create_admin"
 EXTRA_COMMANDS="setup create_admin reset_admin"
+
 SEAHUB_FASTCGI=0
 
 [ -f /etc/config/seafile ] && \