| Index: trunk/extensions/SwiftMedia/LocalSettings.php |
| — | — | @@ -1,29 +0,0 @@ |
| 2 | | -$wgUploadDirectory = "$IP/images/swift"; |
| 3 | | -// we don't need this and will ignore it. $wgDeletedDirectory = "{$wgUploadDirectory}/deleted"; |
| 4 | | -$wgUploadPath = "http://alsted.wikimedia.org/images/swift"; |
| 5 | | - |
| 6 | | -$wgLocalFileRepo = array( |
| 7 | | - 'class' => 'SwiftRepo', |
| 8 | | - // $wgLocalFileRepo must be named 'local' for $repo->isLocal() to work |
| 9 | | - 'name' => 'local', |
| 10 | | - #'directory' => 'http://alsted.wikimedia.org/images', #$wgUploadDirectory, |
| 11 | | - 'directory' => $wgUploadDirectory, |
| 12 | | - 'user' => 'system:media', |
| 13 | | - 'key' => 'secret', |
| 14 | | - 'authurl' => 'http://alsted.wikimedia.org/auth/v1.0', |
| 15 | | - 'container' => 'images%2Fswift', |
| 16 | | - 'scriptDirUrl' => $wgScriptPath, |
| 17 | | - 'scriptExtension' => $wgScriptExtension, |
| 18 | | - 'url' => $wgUploadBaseUrl ? $wgUploadBaseUrl . $wgUploadPath : $wgUploadPath, |
| 19 | | - 'hashLevels' => $wgHashedUploadDirectory ? 2 : 0, |
| 20 | | - 'thumbScriptUrl' => $wgThumbnailScriptPath, |
| 21 | | - 'transformVia404' => !$wgGenerateThumbnailOnParse, |
| 22 | | - #'deletedDir' => $wgDeletedDirectory, |
| 23 | | - 'deletedHashLevels' => 3 |
| 24 | | -); |
| 25 | | - |
| 26 | | -$wgDebugLogFile = "/var/www/debug/abcd"; |
| 27 | | -$wgDebugTimestamps = true; |
| 28 | | -$wgShowExceptionDetails = true; |
| 29 | | - |
| 30 | | - |
| Index: trunk/extensions/SwiftMedia/proxy-server.conf |
| — | — | @@ -1,39 +0,0 @@ |
| 2 | | -[DEFAULT] |
| 3 | | -#cert_file = /etc/swift/cert.crt |
| 4 | | -#key_file = /etc/swift/cert.key |
| 5 | | -bind_port = 80 |
| 6 | | -workers = 8 |
| 7 | | -user = swift |
| 8 | | - |
| 9 | | -[pipeline:main] |
| 10 | | -pipeline = rewrite healthcheck cache swauth proxy-server |
| 11 | | -#pipeline = healthcheck cache swauth proxy-server |
| 12 | | - |
| 13 | | -[app:proxy-server] |
| 14 | | -use = egg:swift#proxy |
| 15 | | -allow_account_management = true |
| 16 | | - |
| 17 | | -#[filter:auth] |
| 18 | | -#use = egg:swift#auth |
| 19 | | -#ssl = true |
| 20 | | - |
| 21 | | -[filter:swauth] |
| 22 | | -use = egg:swift#swauth |
| 23 | | -#default_swift_cluster = local#https://$PROXY_LOCAL_NET_IP:8080/v1 |
| 24 | | -default_swift_cluster = local#http://alsted.wikimedia.org/v1 |
| 25 | | -# Highly recommended to change this key to something else! |
| 26 | | -super_admin_key = j0kans |
| 27 | | - |
| 28 | | -[filter:healthcheck] |
| 29 | | -use = egg:swift#healthcheck |
| 30 | | - |
| 31 | | -[filter:cache] |
| 32 | | -use = egg:swift#memcache |
| 33 | | -memcache_servers = 127.0.0.1:11211 |
| 34 | | - |
| 35 | | -[filter:rewrite] |
| 36 | | -url = http://127.0.0.1/auth/v1.0 |
| 37 | | -login = system:media |
| 38 | | -key = 8lksg0p |
| 39 | | -paste.filter_factory = wmf.rewrite:filter_factory |
| 40 | | - |
| Index: trunk/extensions/SwiftMedia/wmf/config.py |
| — | — | @@ -1,10 +0,0 @@ |
| 2 | | -# the auth system turns our login and key into an account / token pair. |
| 3 | | -# the account remains valid forever, but the token times out. |
| 4 | | -account = 'AUTH_dea4a45c-a80b-43b5-8e8b-e452f0dc778f' |
| 5 | | - |
| 6 | | -# the name of the scaler cluster. |
| 7 | | -thumbhost = 'ms5.pmtpa.wmnet' |
| 8 | | - |
| 9 | | -# upload doesn't like our User-agent (Python-urllib/2.6), otherwise we could call it using urllib2.urlopen() |
| 10 | | -user_agent = 'Mozilla/5.0' |
| 11 | | - |
| Index: trunk/extensions/SwiftMedia/wmf/config.py.sample |
| — | — | @@ -0,0 +1,10 @@ |
| | 2 | +# the auth system turns our login and key into an account / token pair. |
| | 3 | +# the account remains valid forever, but the token times out. |
| | 4 | +account = 'AUTH_...' |
| | 5 | + |
| | 6 | +# the name of the scaler cluster. |
| | 7 | +thumbhost = 'localhost' |
| | 8 | + |
| | 9 | +# upload doesn't like our User-agent (Python-urllib/2.6), otherwise we could call it using urllib2.urlopen() |
| | 10 | +user_agent = 'Swift thumbnail proxy' |
| | 11 | + |
| Property changes on: trunk/extensions/SwiftMedia/wmf/config.py.sample |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 1 | 12 | + native |