From bdee166ec49a499e7203e9bf7f4bd783b5ef0232 Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Wed, 3 Sep 2008 17:14:16 -0400 Subject: we are building with the format 3.0 (git) packaging techniques now; simplify makefile. change "release" target to "tarbball", since we are not releasing this way yet. --- Makefile | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 1e0b649..ff0ee0c 100644 --- a/Makefile +++ b/Makefile @@ -5,23 +5,20 @@ all: keytrans keytrans: $(MAKE) -C src/keytrans -release: clean +tarball: clean rm -rf monkeysphere-$(MONKEYSPHERE_VERSION) mkdir -p monkeysphere-$(MONKEYSPHERE_VERSION)/doc ln -s ../../website/getting-started-user.mdwn ../../website/getting-started-admin.mdwn ../../doc/TODO ../../doc/MonkeySpec monkeysphere-$(MONKEYSPHERE_VERSION)/doc ln -s ../COPYING ../etc ../Makefile ../man ../src monkeysphere-$(MONKEYSPHERE_VERSION) - tar -ch monkeysphere-$(MONKEYSPHERE_VERSION) | gzip -n > monkeysphere_$(MONKEYSPHERE_VERSION).orig.tar.gz + tar -ch monkeysphere-$(MONKEYSPHERE_VERSION) | gzip -n > monkeysphere_$(MONKEYSPHERE_VERSION).tar.gz rm -rf monkeysphere-$(MONKEYSPHERE_VERSION) -debian-package: release - tar xzf monkeysphere_$(MONKEYSPHERE_VERSION).orig.tar.gz - cp -a debian monkeysphere-$(MONKEYSPHERE_VERSION) - (cd monkeysphere-$(MONKEYSPHERE_VERSION) && debuild -uc -us) - rm -rf monkeysphere-$(MONKEYSPHERE_VERSION) +debian-package: + debuild -uc -us clean: $(MAKE) -C src/keytrans clean # clean up old monkeysphere packages lying around as well. rm -f monkeysphere_* -.PHONY: all clean release debian-package +.PHONY: all clean tarball debian-package -- cgit v1.2.3 From 076fac6b3356eff5809c49813d854a15b2f63d05 Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Wed, 3 Sep 2008 17:28:08 -0400 Subject: debian/changelog: preparing for 0.13-1 release. --- debian/changelog | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 773acce..8688b95 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,14 @@ -monkeysphere (0.13~pre-1) UNRELEASED; urgency=low +monkeysphere (0.13-1) experimental; urgency=low [ Daniel Kahn Gillmor ] * tweaks in /usr/bin/monkeysphere to handle odd secret keyrings. + * updated makefile to reflect the package building technique we've been + using for a month now. [ Jameson Graef Rollins ] * move location of user config directory to ~/.monkeysphere. - -- Jameson Graef Rollins Wed, 03 Sep 2008 13:35:23 -0700 + -- Daniel Kahn Gillmor Wed, 03 Sep 2008 17:26:10 -0400 monkeysphere (0.12-1) experimental; urgency=low -- cgit v1.2.3 From cae2d7c0319da8670a3c348ceef56e17322689a4 Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Wed, 3 Sep 2008 17:30:29 -0400 Subject: changing bug history to refer to ~/.monkeysphere instead of ~/.config/monkeysphere to avoid future confusion. --- .../bugs/monkeysphere-should-respect-keyserver-settings-in-gpg.mdwn | 4 ++-- website/bugs/setup-test-server-for-public.mdwn | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/website/bugs/monkeysphere-should-respect-keyserver-settings-in-gpg.mdwn b/website/bugs/monkeysphere-should-respect-keyserver-settings-in-gpg.mdwn index 85f79f1..0630cc4 100644 --- a/website/bugs/monkeysphere-should-respect-keyserver-settings-in-gpg.mdwn +++ b/website/bugs/monkeysphere-should-respect-keyserver-settings-in-gpg.mdwn @@ -4,14 +4,14 @@ Currently, monkeysphere-ssh-proxycommand checks the following places to determine which keyserver to use (in order of priority): * environment variable (MONKEYSPHERE_KEYSERVER) - * KEYSERVER variable in ~/.config/monkeysphere/monkeysphere.conf + * KEYSERVER variable in ~/.monkeysphere/monkeysphere.conf * default value of subkeys.pgp.net It would be useful if monkeysphere also consulted ~/.gnupg/gpg.conf, using the following order instead: * environment variable (MONKEYSPHERE_KEYSERVER) - * KEYSERVER variable in ~/.config/monkeysphere/monkeysphere.conf + * KEYSERVER variable in ~/.monkeysphere/monkeysphere.conf * keyserver variable in ~/.gnupg/gpg.conf * default value of subkeys.pgp.net diff --git a/website/bugs/setup-test-server-for-public.mdwn b/website/bugs/setup-test-server-for-public.mdwn index 5b05759..65fa893 100644 --- a/website/bugs/setup-test-server-for-public.mdwn +++ b/website/bugs/setup-test-server-for-public.mdwn @@ -63,7 +63,7 @@ I envision a script you'd invoke like: root@george# addmsuser foo 'Foo T. Bar ' Which would create the `foo` account, populate -`~foo/.config/monkeysphere/authorized_user_ids`, make a note in a log +`~foo/.monkeysphere/authorized_user_ids`, make a note in a log someplace, and send a welcome letter. --dkg -- cgit v1.2.3 From 6ee744d7995ab3445a0575440f1fe3571fabb78e Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Wed, 3 Sep 2008 18:14:13 -0400 Subject: update changelog to reflect the new monkeysphere user configuration location --- doc/george/changelog | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/doc/george/changelog b/doc/george/changelog index 8b03a7f..28cfab4 100644 --- a/doc/george/changelog +++ b/doc/george/changelog @@ -7,6 +7,17 @@ * changes to this system (first command at top, last at bottom) * ****************************************************************************** +2008-09-03 - micah + * migrated /home/*/.config/monkeysphere/authorized_user_ids to new + agreed location: /home/*/.monkeysphere/authorized_user_ids and created + a symlink in the original location for transition purposes. Also, + did /root's as well. I used this hackish mechanism: + $ for user in `find . -wholename './*/.config/monkeysphere/authorized_user_ids' \ + | cut -d/ -f2`; do mkdir -v ${user}/.monkeysphere; chown ${user}:${user} \ + ${user}/.monkeysphere; mv -v ${user}/.config/monkeysphere/authorized_user_ids \ + ${user}/.monkeysphere; ln -s /home/${user}/.monkeysphere/authorized_user_ids \ + ${user}/.config/monkeysphere/authorized_user_ids; done + 2008-09-01 - dkg * set up http://dkg.monkeysphere.info so that i could play around with ikiwiki updates -- cgit v1.2.3 From d5430fdb227a15f678f69b4b1b175e9d308df3db Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Wed, 3 Sep 2008 18:30:06 -0400 Subject: more notes on work on george. --- doc/george/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/doc/george/changelog b/doc/george/changelog index 28cfab4..002a46b 100644 --- a/doc/george/changelog +++ b/doc/george/changelog @@ -18,6 +18,14 @@ ${user}/.monkeysphere; ln -s /home/${user}/.monkeysphere/authorized_user_ids \ ${user}/.config/monkeysphere/authorized_user_ids; done + - dkg + * added the monkeysphere archive repository signing key + * aptitude update && aptitude full-upgrade (brings in monkeysphere 0.13-1) + * cleaned up /etc/skel to reflect correct location of the + monkeysphere config directory. + * micah moved all the existing config stuff over, and left + symlinks so people aren't disoriented. + 2008-09-01 - dkg * set up http://dkg.monkeysphere.info so that i could play around with ikiwiki updates -- cgit v1.2.3