Merge branch 'master' of ssh://propellor.branchable.com

This commit is contained in:
Joey Hess 2014-12-09 00:05:47 -04:00
commit 914f762d01
4 changed files with 113 additions and 0 deletions

View File

@ -0,0 +1,34 @@
Hello,
Still working on the reprepro property :)
Here A property that I am using to publish a repository via apache (this is a prototype)
website :: String -> Property
website hn = toProp $ Apache.siteEnabled hn apachecfg
where
apachecfg = [ "<VirtualHost *>"
, "DocumentRoot " ++ basePath
, "<Directory " ++ basePath ++ ">"
, " Options Indexes FollowSymLinks Multiviews"
, " Order allow,deny"
, Apache.allowAll
, "</Directory>"
] ++ concatMap deny ["db", "conf", "incoming"]
++ ["</VirtualHost>"]
deny dir = [ "<Directory \"" ++ basePath ++ "apt/*/" ++ dir ++ "\">"
, " Order deny,allow"
, " Deny from all"
, "</Directory>"
]
during my test I am runing the config.hs with
runhaskell config.hs (it work the first time, the apache config files are ok)
but when I do a modification on the apachecfg and rerun the runhaskell,
the config files are not updated. I need to remove them to have an updated version.
cheers
Fred

View File

@ -0,0 +1,30 @@
[[!comment format=mdwn
username="picca"
subject="first run"
date="2014-12-08T09:31:46Z"
content="""
root@mordor:~/propellor/src# PROPELLOR_DEBUG=1 runhaskell config.hs
[2014-12-08 10:27:10 CET] read: hostname [\"-f\"]
[2014-12-08 10:27:10 CET] command line: Run \"mordor\"
[2014-12-08 10:27:10 CET] read: git [\"remote\"]
[2014-12-08 10:27:10 CET] read: git [\"symbolic-ref\",\"--short\",\"HEAD\"]
[2014-12-08 10:27:10 CET] call: git [\"fetch\"]
Pull from central git repository ... done
[2014-12-08 10:27:12 CET] read: git [\"show-ref\",\"--hash\",\"master\"]
[2014-12-08 10:27:12 CET] read: git [\"show-ref\",\"--hash\",\"master\"]
mordor has Operating System (Debian Unstable) \"i386\" ... ok
[2014-12-08 10:27:12 CET] read: apt-cache [\"policy\",\"etckeeper\"]
mordor apt installed etckeeper ... ok
[2014-12-08 10:27:13 CET] read: apt-cache [\"policy\",\"ssh\"]
mordor apt installed ssh ... ok
[2014-12-08 10:27:13 CET] read: passwd [\"-S\",\"root\"]
mordor root has password ... ok
[2014-12-08 10:27:13 CET] call: a2query [\"-q\",\"-s\",\"reprepro\"]
[2014-12-08 10:27:14 CET] read: apt-cache [\"policy\",\"apache2\"]
[2014-12-08 10:27:14 CET] call: a2ensite [\"--quiet\",\"reprepro\"]
Enabling site reprepro.
[2014-12-08 10:27:15 CET] call: sh [\"-c\",\"set -e ; service 'apache2' reload >/dev/null 2>&1 || true\"]
mordor create reprepro ... done
mordor overall ... done
"""]]

View File

@ -0,0 +1,38 @@
[[!comment format=mdwn
username="picca"
subject="second run with content modified"
date="2014-12-08T09:37:43Z"
content="""
Second run after adding a space here
- , \" Options Indexes FollowSymLinks Multiviews\"
+ , \" Options Indexes FollowSymLinks Multiviews\"
root@mordor:~/propellor/src# PROPELLOR_DEBUG=1 runhaskell config.hs
[2014-12-08 10:34:19 CET] read: hostname [\"-f\"]
[2014-12-08 10:34:19 CET] command line: Run \"mordor\"
[2014-12-08 10:34:19 CET] read: git [\"remote\"]
[2014-12-08 10:34:19 CET] read: git [\"symbolic-ref\",\"--short\",\"HEAD\"]
[2014-12-08 10:34:19 CET] call: git [\"fetch\"]
remote: Counting objects: 32, done.
remote: Compressing objects: 100% (6/6), done.
remote: Total 6 (delta 3), reused 0 (delta 0)
Dépaquetage des objets: 100% (6/6), fait.
Depuis git://git.kitenet.net/propellor
c5a8cae..9ac0dfb master -> origin/master
Pull from central git repository ... done
[2014-12-08 10:34:20 CET] read: git [\"show-ref\",\"--hash\",\"master\"]
[2014-12-08 10:34:20 CET] read: git [\"show-ref\",\"--hash\",\"master\"]
mordor has Operating System (Debian Unstable) \"i386\" ... ok
[2014-12-08 10:34:20 CET] read: apt-cache [\"policy\",\"etckeeper\"]
mordor apt installed etckeeper ... ok
[2014-12-08 10:34:21 CET] read: apt-cache [\"policy\",\"ssh\"]
mordor apt installed ssh ... ok
[2014-12-08 10:34:21 CET] read: passwd [\"-S\",\"root\"]
mordor root has password ... ok
[2014-12-08 10:34:21 CET] call: a2query [\"-q\",\"-s\",\"reprepro\"]
mordor create reprepro ... ok
mordor overall ... ok
"""]]

View File

@ -0,0 +1,11 @@
[[!comment format=mdwn
username="picca"
subject="comment 3"
date="2014-12-08T10:47:59Z"
content="""
I forgot to say that the content of
/etc/apache2/site-xxx/reprepro[.conf]
is unmodifed after this second run
"""]]