diff options
| -rw-r--r-- | pypaste-confd | 27 | ||||
| -rw-r--r-- | pypaste-initd | 26 |
2 files changed, 31 insertions, 22 deletions
diff --git a/pypaste-confd b/pypaste-confd index 5045059..cc4d691 100644 --- a/pypaste-confd +++ b/pypaste-confd @@ -1,17 +1,16 @@ # /etc/conf.d/pypaste PYPASTE_SITE="" -PYPASTE_CONTENT_LENGTH_MAX_BYTES="" # 2M -PYPASTE_ENDPOINT="" -PYPASTE_REGION="" -PYPASTE_BUCKET="" -PYPASTE_ACCESS_KEY="" -PYPASTE_SECRET_KEY="" -PYPASTE_S3_MAX_BYTES="" # 1G -PYPASTE_DICTIONARY="" -PYPASTE_KEY_LENGTH="" -PYPASTE_DATABASE="" -PYPASTE_LISTEN_SOCKET="" -PYPASTE_LOG_FILE="" -PYPASTE_DEFAULT_STYLE="" -PYPASTE_ARGS="--line-numbers --path=${PYPASTE_LISTEN_SOCKET}" +PYPASTE_CONTENT_LENGTH_MAX_BYTES="2000000" # 2M +PYPASTE_STORAGE_MAX_BYTES="10000000000" # 10G +PYPASTE_DICTIONARY="/usr/share/dict/eff_large_wordlist.txt" +PYPASTE_KEY_LENGTH="3" +PYPASTE_DATABASE="/var/lib/pypaste/pastes.sqlite" +PYPASTE_SOCKET_DIR="/run/pypaste" +PYPASTE_SOCKET_NAME="pypaste.sock" +PYPASTE_LOG_FILE="/var/log/pypaste.log" +PYPASTE_DEFAULT_STYLE="native" +PYPASTE_ARGS=" + --line-numbers + sqlite +" diff --git a/pypaste-initd b/pypaste-initd index 52c449d..4f5e399 100644 --- a/pypaste-initd +++ b/pypaste-initd @@ -5,25 +5,35 @@ depend() { } supervisor=supervise-daemon -command="/usr/bin/pypaste" + +command="python" + command_args=" + -m + pypaste.server --site=${PYPASTE_SITE} --content-length-max-bytes=${PYPASTE_CONTENT_LENGTH_MAX_BYTES} - --endpoint=${PYPASTE_ENDPOINT} - --region=${PYPASTE_REGION} - --bucket=${PYPASTE_BUCKET} - --access-key=${PYPASTE_ACCESS_KEY} - --secret-key=${PYPASTE_SECRET_KEY} - --s3-max-bytes=${PYPASTE_S3_MAX_BYTES} + --storage-max-bytes=${PYPASTE_STORAGE_MAX_BYTES} --default-style=${PYPASTE_DEFAULT_STYLE} --key-length=${PYPASTE_KEY_LENGTH} --dictionary=${PYPASTE_DICTIONARY} --database=${PYPASTE_DATABASE} --default-style=${PYPASTE_STYLE} + --socket=${PYPASTE_SOCKET_DIR}/${PYPASTE_SOCKET_NAME} + --socket-mode=0666 + --default-style=${PYPASTE_DEFAULT_STYLE} ${PYPASTE_ARGS} " -error_log="${PYPASTE_ERROR_LOG}" +error_log="${PYPASTE_LOG_FILE}" : "${command_user=pypaste:pypaste}" +start_pre() { + touch ${PYPASTE_LOG_FILE} || return $? + chown pypaste:pypaste ${PYPASTE_LOG_FILE} || return $? + mkdir -p ${PYPASTE_SOCKET_DIR} || return $? + setfacl -m 'u:pypaste:rwx' ${PYPASTE_SOCKET_DIR} || return $? + setfacl -m 'u:lighttpd:rwx' ${PYPASTE_SOCKET_DIR} || return $? + rm -f ${PYPASTE_SOCKET_DIR}/${PYPASTE_SOCKET_NAME} +} |