Skip to content

Commit

Permalink
Mv all refs from *.milkbox.net to melpa.org
Browse files Browse the repository at this point in the history
  • Loading branch information
milkypostman committed Oct 23, 2014
1 parent 6f9cc28 commit 8851c51
Show file tree
Hide file tree
Showing 12 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion Cask
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(source "melpa" "http://melpa.milkbox.net/packages/")
(source "melpa" "http://melpa.org/packages/")

(development
(depends-on "ecukes")
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ sandbox: packages/archive-contents
--eval '(setq user-emacs-directory "$(SANDBOX)")' \
-l package \
--eval "(add-to-list 'package-archives '(\"gnu\" . \"http://elpa.gnu.org/packages/\") t)" \
--eval "(add-to-list 'package-archives '(\"melpa\" . \"http://melpa.milkbox.net/packages/\") t)" \
--eval "(add-to-list 'package-archives '(\"melpa\" . \"http://melpa.org/packages/\") t)" \
--eval "(add-to-list 'package-archives '(\"sandbox\" . \"$(shell pwd)/$(PKGDIR)/\") t)" \
--eval "(package-refresh-contents)"
--eval "(package-initialize)"
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ code using simple recipes. (Think of it as a server-side version of
Packages are updated at intervals throughout the day.

To browse available packages, check out the
[archive index page](http://melpa.milkbox.net/).
[archive index page](http://melpa.org/).

Adding packages is as simple as submitting a pull request; read on for
details.
Expand Down Expand Up @@ -41,7 +41,7 @@ Enable installation of packages from MELPA by adding an entry to
```lisp
(require 'package)
(add-to-list 'package-archives
'("melpa" . "http://melpa.milkbox.net/packages/") t)
'("melpa" . "http://melpa.org/packages/") t)
(when (< emacs-major-version 24)
;; For important compatibility libraries like cl-lib
(add-to-list 'package-archives '("gnu" . "http://elpa.gnu.org/packages/")))
Expand Down Expand Up @@ -412,7 +412,7 @@ format.
such as Emacs 24. If you have an older version of Emacs, you can get a
suitable `package.el` [here](http://bit.ly/pkg-el23).

[melpa]: http://melpa.milkbox.net
[melpa]: http://melpa.org


## API
Expand Down Expand Up @@ -476,11 +476,11 @@ in your `package-archives` list.

```lisp
(add-to-list 'package-archives
'("melpa-stable" . "http://melpa-stable.milkbox.net/packages/") t)
'("melpa-stable" . "http://stable.melpa.org/packages/") t)
```

An online list of available packages can be found at
[http://melpa-stable.milkbox.net](http://melpa-stable.milkbox.net).
[http://stable.melpa.org](http://stable.melpa.org).

### Stable Version Generation

Expand Down
2 changes: 1 addition & 1 deletion cfg/etc/nginx/sites-available/melpa
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ server {
# proxy to Apache 2 and mod_python
location / {
proxy_pass http://127.0.0.1:1337/;
proxy_redirect http://melpa.milkbox.net:1337/ http://melpa.milkbox.net/;
proxy_redirect http://melpa.org:1337/ http://melpa.org/;
# proxy_redirect off;
chunked_transfer_encoding off;

Expand Down
2 changes: 1 addition & 1 deletion cfg/etc/nginx/sites-available/melpa-stable
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

server {
server_name hiddencameras.milkbox.net;
rewrite ^ $scheme://melpa-stable.milkbox.net$request_uri? permanent;
rewrite ^ $scheme://stable.melpa.org$request_uri? permanent;
}

server {
Expand Down
2 changes: 1 addition & 1 deletion cfg/home/etc/nginx
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ http {
##

server {
server_name melpa.milkbox.net;
server_name melpa.org;
server_tokens off;
server_name_in_redirect off;

Expand Down
2 changes: 1 addition & 1 deletion cfg/home/etc/nginx-stable
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ http {
##

server {
server_name melpa-stable.milkbox.net;
server_name stable.melpa.org;
server_tokens off;
server_name_in_redirect off;

Expand Down
2 changes: 1 addition & 1 deletion cfg/home/service/reporter-stable/run
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ BODY=`mktemp`

cd ${HOME}/melpa

echo "To: MP <dcurtis@milkbox.net>" > ${BODY}
echo "To: MP <d@milkbox.net>" > ${BODY}
echo "Subject: [MELPA] `date "+%Y%m%d %H:%M %z"`" >> ${BODY}
echo >> ${BODY}
echo "# Old Packages" >> ${BODY}
Expand Down
2 changes: 1 addition & 1 deletion cfg/home/service/reporter/run
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ BODY=`mktemp`

cd ${HOME}/melpa

echo "To: MP <dcurtis@milkbox.net>" > ${BODY}
echo "To: MP <d@milkbox.net>" > ${BODY}
echo "Subject: [MELPA] `date "+%Y%m%d %H:%M %z"`" >> ${BODY}
echo >> ${BODY}
echo "# Old Packages" >> ${BODY}
Expand Down
2 changes: 1 addition & 1 deletion html/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ updates.rss: updates.rss.erb
erb updates.rss.erb > updates.rss.tmp && mv updates.rss.tmp updates.rss

livejson:
for f in recipes archive download_counts build-status; do curl http://melpa.milkbox.net/$$f.json > $$f.json; done
for f in recipes archive download_counts build-status; do curl http://melpa.org/$$f.json > $$f.json; done

clean:
-rm -v updates.rss
Expand Down
4 changes: 2 additions & 2 deletions html/partials/getting-started.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ <h2>Installing</h2>

<pre><code>(require 'package)
(add-to-list 'package-archives
'("melpa" . "http://melpa.milkbox.net/packages/") t)</code></pre>
'("melpa" . "http://melpa.org/packages/") t)</code></pre>

<p>or to add the stable package repository, use this snippet:</p>

<pre><code>(require 'package)
(add-to-list 'package-archives
'("melpa-stable" . "http://melpa-stable.milkbox.net/packages/") t)</code></pre>
'("melpa-stable" . "http://stable.melpa.org/packages/") t)</code></pre>

<p>In Emacs &lt; 24, you'll also need to explicitly include the GNU
ELPA archive, which provides important compatibility libraries like <code>cl-lib</code>:</p>
Expand Down
4 changes: 2 additions & 2 deletions html/updates.rss.erb
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:trackback="http://madskills.com/public/xml/rss/module/trackback/"
xmlns:atom="http://www.w3.org/2005/Atom">
<% base_url = "http://melpa.milkbox.net/" %>
<% base_url = "http://melpa.org/" %>
<channel>
<title>MELPA package updates</title>
<link>http://melpa.milkbox.net</link>
<link>http://melpa.org</link>
<atom:link href="<%= base_url %>updates.rss" rel="self" type="application/rss+xml" />
<language>en-us</language>
<ttl>40</ttl>
Expand Down

0 comments on commit 8851c51

Please sign in to comment.