SRC}/custom/conf/app.example.ini \ ${STAGEDIR}${ETCDIR}/conf/app.ini.defaults ${MKDIR} ${STAGEDIR}${DATADIR} - ${MKDIR} ${STAGEDIR}/var/db/forgejo/data - ${MKDIR} ${STAGEDIR}/var/db/forgejo/forgejo-repositories - ${MKDIR} ${STAGEDIR}/var/log/forgejo + ${MKDIR} ${STAGEDIR}${DBDIR}/data + ${MKDIR} ${STAGEDIR}${DBDIR}/forgejo-repositories + ${MKDIR} ${STAGEDIR}${LOGDIR} do-install-BINDATA-off: cd ${WRKSRC} && \ diff --git a/www/forgejo/distinfo b/www/forgejo/distinfo index fd739adc9fdf..4c444383e3ce 100644 --- a/www/forgejo/distinfo +++ b/www/forgejo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1758356864 -SHA256 (forgejo-src-12.0.4.tar.gz) = b1adeec3f5f446c63996250a334be62baf0cd8fbb9ad71a3316a5896cb327d08 -SIZE (forgejo-src-12.0.4.tar.gz) = 54124346 +TIMESTAMP = 1761217700 +SHA256 (forgejo-src-13.0.1.tar.gz) = 98cb495cd07881d90aa32cf143facef4abba2b732684ab1d938af9fa3ab12f26 +SIZE (forgejo-src-13.0.1.tar.gz) = 55449730 diff --git a/www/forgejo/files/app.ini.sample.in b/www/forgejo/files/app.ini.sample.in index b54e756578be..f06b9819cc84 100644 --- a/www/forgejo/files/app.ini.sample.in +++ b/www/forgejo/files/app.ini.sample.in @@ -23,7 +23,7 @@ # localhost. # # If you'd rather use the web-based installer, remove this conf/app.ini file -# and make %%PREFIX%%/etc/forgejo/conf writeable to the git user. +# and make %%ETCDIR%%/conf writeable to the git user. APP_NAME = Forgejo: A self-hosted lightweight software forge RUN_MODE = prod @@ -34,17 +34,17 @@ DB_TYPE = sqlite3 HOST = 127.0.0.1:3306 NAME = forgejo PASSWD = -PATH = /var/db/forgejo/forgejo.db +PATH = %%DBDIR%%/forgejo.db SSL_MODE = disable USER = root [indexer] -ISSUE_INDEXER_PATH = /var/db/forgejo/indexers/issues.bleve +ISSUE_INDEXER_PATH = %%DBDIR%%/indexers/issues.bleve [log] LEVEL = Info MODE = file -ROOT_PATH = /var/log/forgejo +ROOT_PATH = %%LOGDIR%% [mailer] ENABLED = false @@ -53,18 +53,18 @@ ENABLED = false JWT_SECRET = CHANGE_ME [picture] -AVATAR_UPLOAD_PATH = /var/db/forgejo/data/avatars +AVATAR_UPLOAD_PATH = %%DBDIR%%/data/avatars DISABLE_GRAVATAR = true ENABLE_FEDERATED_AVATAR = false [repository] -ROOT = /var/db/forgejo/forgejo-repositories +ROOT = %%DBDIR%%/forgejo-repositories # Forgejo's default is 'bash', so if you have bash installed, you can comment # this out. SCRIPT_TYPE = sh [repository.upload] -TEMP_PATH = /var/db/forgejo/data/tmp/uploads +TEMP_PATH = %%DBDIR%%/data/tmp/uploads [security] INSTALL_LOCK = true @@ -73,10 +73,10 @@ SECRET_KEY = CHANGE_ME [session] PROVIDER = file -PROVIDER_CONFIG = /var/db/forgejo/data/sessions +PROVIDER_CONFIG = %%DBDIR%%/data/sessions [server] -APP_DATA_PATH = /var/db/forgejo/data +APP_DATA_PATH = %%DBDIR%%/data DISABLE_SSH = false DOMAIN = localhost HTTP_ADDR = 127.0.0.1 diff --git a/www/forgejo/files/forgejo.in b/www/forgejo/files/forgejo.in index 026fed82b0b2..516f63862e60 100644 --- a/www/forgejo/files/forgejo.in +++ b/www/forgejo/files/forgejo.in @@ -33,7 +33,7 @@ start_cmd="${name}_start" start_precmd="${name}_prestart" forgejo_start() { - for d in /var/db/forgejo /var/log/forgejo; do + for d in %%DBDIR%% %%LOGDIR%%; do if [ ! -e "$d" ]; then mkdir "$d" chown ${forgejo_user} "$d" diff --git a/www/forgejo/pkg-plist b/www/forgejo/pkg-plist index cfdd317d833c..133c23b66678 100644 --- a/www/forgejo/pkg-plist +++ b/www/forgejo/pkg-plist @@ -1,8 +1,8 @@ @sample %%ETCDIR%%/conf/app.ini.sample %%ETCDIR%%/conf/app.ini.defaults sbin/forgejo -@dir share/forgejo -@dir(git,git,755) /var/db/forgejo -@dir(git,git,755) /var/db/forgejo/data -@dir(git,git,755) /var/db/forgejo/forgejo-repositories -@dir(git,git,755) /var/log/forgejo +@dir %%DATADIR%% +@dir(git,git,755) %%DBDIR%% +@dir(git,git,755) %%DBDIR%%/data +@dir(git,git,755) %%DBDIR%%/forgejo-repositories +@dir(git,git,755) %%LOGDIR%%