clckwrks-dot-com 0.3.9 → 0.3.11
raw patch · 3 files changed
+27/−25 lines, 3 filesdep +network-uridep −clckwrks-plugin-bugsdep ~cabal-debiandep ~clckwrksdep ~clckwrks-theme-clckwrks
Dependencies added: network-uri
Dependencies removed: clckwrks-plugin-bugs
Dependency ranges changed: cabal-debian, clckwrks, clckwrks-theme-clckwrks, happstack-server, network, text
Files
- Backups.hs +2/−0
- Main.hs +17/−15
- clckwrks-dot-com.cabal +8/−10
Backups.hs view
@@ -9,6 +9,8 @@ , uriRegName = "clckwrks.com" , uriPort = ""} , keep = 50+ , backupHour = const True+ , cleanHour = \ n -> n < 3 , localTop = "/srv/backups" , nice = 10, delay = 0 , bwLimit = Just 20
Main.hs view
@@ -1,20 +1,20 @@-{-# LANGUAGE FlexibleContexts, OverloadedStrings, PackageImports, RankNTypes #-}+{-# LANGUAGE FlexibleContexts, OverloadedStrings #-} module Main where import Clckwrks-import Clckwrks.GetOpts (parseArgs, clckwrksOpts)-import Clckwrks.Server (simpleClckwrks)-import Clckwrks.Plugin (clckPlugin)-import Clckwrks.Bugs.Plugin (bugsPlugin)-import Clckwrks.Media.Plugin (mediaPlugin)-import Clckwrks.Page.Plugin (pagePlugin)-import Clckwrks.Page.URL (PageURL(..))-import Control.Applicative ((<$>))-import Data.Text (Text)--- import "clckwrks-theme-clckwrks" Theme (theme)-import Theme (theme)-import Web.Plugins.Core (Plugin(..), addHandler, getPluginRouteFn, initPlugin, setTheme)-import System.Environment (getArgs)+import Clckwrks.GetOpts (parseArgs, clckwrksOpts)+import Clckwrks.Server (simpleClckwrks)+import Clckwrks.Plugin (clckPlugin)+import Clckwrks.Authenticate.Plugin (authenticatePlugin)+-- import Clckwrks.Bugs.Plugin (bugsPlugin)+import Clckwrks.Media.Plugin (mediaPlugin)+import Clckwrks.Page.Plugin (pagePlugin)+import Clckwrks.Page.URL (PageURL(..))+import Control.Applicative ((<$>))+import Data.Text (Text)+import Theme (theme)+import Web.Plugins.Core (Plugin(..), addHandler, getPluginRouteFn, initPlugin, setTheme)+import System.Environment (getArgs) ------------------------------------------------------------------------------ -- ClckwrksConfig@@ -53,8 +53,10 @@ do let p = plugins clckState addHandler p "blog" blogHandler initPlugin p "" clckPlugin+ initPlugin p "http://www.clckwrks.com" authenticatePlugin+-- initPlugin p "http://localhost:8000" authenticatePlugin initPlugin p "" pagePlugin- initPlugin p "" bugsPlugin+-- initPlugin p "" bugsPlugin initPlugin p "" mediaPlugin setTheme p (Just theme) return (clckState, cc)
clckwrks-dot-com.cabal view
@@ -1,5 +1,5 @@ name: clckwrks-dot-com-version: 0.3.9+version: 0.3.11 synopsis: clckwrks.com homepage: http://www.clckwrks.com/ license: BSD3@@ -11,9 +11,8 @@ cabal-version: >=1.8 source-repository head- type: darcs- subdir: clckwrks-dot-com- location: http://hub.darcs.net/stepcut/clckwrks+ type: git+ location: git://github.com/clckwrks/clckwrks-dot-com.git Flag backups Description: enable the backups executable (currently disabled by default do to wacky dependencies not on hackage)@@ -24,17 +23,16 @@ ghc-options: -threaded -O2 -rtsopts -with-rtsopts=-I0 build-tools: hsx2hs build-depends: base > 4 && <5,- clckwrks >= 0.21 && < 0.23,- clckwrks-theme-clckwrks == 0.4.*,- clckwrks-plugin-bugs == 0.7.*,+ clckwrks >= 0.23 && < 0.24,+ clckwrks-theme-clckwrks == 0.5.*, clckwrks-plugin-media == 0.6.*, clckwrks-plugin-page >= 0.3 && < 0.4, containers >= 0.4 && < 0.6,- happstack-server >= 7.0 && < 7.4,+ happstack-server >= 7.0 && < 7.5, hsp >= 0.9 && < 0.11, mtl >= 2.0 && < 2.3, network >= 2,- text >= 0.11 && < 1.2,+ text >= 0.11 && < 1.3, web-plugins >= 0.1 && < 0.3 Executable clckwrks-dot-com-backups@@ -42,7 +40,7 @@ if flag(backups) Buildable: True GHC-Options: -threaded -Wall -Wwarn -O2 -fno-warn-name-shadowing -fno-warn-missing-signatures -fwarn-tabs -fno-warn-unused-binds -fno-warn-orphans -fwarn-unused-imports -fno-spec-constr- Build-depends: archive >= 1.6, base, Extra, network, cabal-debian >= 4+ Build-depends: archive >= 1.6, base, Extra, network-uri, cabal-debian >= 4.24 else Buildable: False