diff --git a/config/keter.yml b/config/keter.yml index 24177b0fc..ca1c4cdbb 100644 --- a/config/keter.yml +++ b/config/keter.yml @@ -15,7 +15,7 @@ stanzas: args: [] hosts: - - testworx.tcs.ifi.lmu.de + - uni2work.ifi.lmu.de ssl: true @@ -24,19 +24,22 @@ stanzas: - LDAPDN - LDAPPW - LDAPBN - - DUMMY_LOGIN - DETAILED_LOGGING - LOG_ALL + - PGUSER + - PGPASS + - PGHOST + - PGPORT + - PGDATABASE # Use the following to automatically copy your bundle upon creation via `yesod # keter`. Uses `scp` internally, so you can set it to a remote destination # copy-to: user@host:/opt/keter/incoming/ -copy-to: keter@testworx.tcs.ifi.lmu.de:/opt/keter/incoming/ -copy-to-args: - - "-P 30363" +copy-to: root@uni2work.ifi.lmu.de:/opt/keter/incoming/ +copy-to-args: [] + # If you would like to have Keter automatically create a PostgreSQL database # and set appropriate environment variables for it to be discovered, uncomment # the following line. -plugins: - postgres: true +plugins: {} diff --git a/config/keter_testworx.yml b/config/keter_testworx.yml new file mode 100644 index 000000000..24177b0fc --- /dev/null +++ b/config/keter_testworx.yml @@ -0,0 +1,42 @@ +root: .. + +stanzas: + - type: webapp + + # Name of your executable. You are unlikely to need to change this. + # Note that all file paths are relative to the keter.yml file. + # + # The path given is for Stack projects. If you're still using cabal, change + # to + # exec: ../dist/build/uniworx/uniworx + exec: ../dist/bin/uniworx + + # Command line options passed to your application. + args: [] + + hosts: + - testworx.tcs.ifi.lmu.de + + ssl: true + + forward-env: + - LDAPURI + - LDAPDN + - LDAPPW + - LDAPBN + - DUMMY_LOGIN + - DETAILED_LOGGING + - LOG_ALL + +# Use the following to automatically copy your bundle upon creation via `yesod +# keter`. Uses `scp` internally, so you can set it to a remote destination +# copy-to: user@host:/opt/keter/incoming/ +copy-to: keter@testworx.tcs.ifi.lmu.de:/opt/keter/incoming/ +copy-to-args: + - "-P 30363" + +# If you would like to have Keter automatically create a PostgreSQL database +# and set appropriate environment variables for it to be discovered, uncomment +# the following line. +plugins: + postgres: true diff --git a/config/keter_uni2work.yml b/config/keter_uni2work.yml new file mode 100644 index 000000000..ca1c4cdbb --- /dev/null +++ b/config/keter_uni2work.yml @@ -0,0 +1,45 @@ +root: .. + +stanzas: + - type: webapp + + # Name of your executable. You are unlikely to need to change this. + # Note that all file paths are relative to the keter.yml file. + # + # The path given is for Stack projects. If you're still using cabal, change + # to + # exec: ../dist/build/uniworx/uniworx + exec: ../dist/bin/uniworx + + # Command line options passed to your application. + args: [] + + hosts: + - uni2work.ifi.lmu.de + + ssl: true + + forward-env: + - LDAPURI + - LDAPDN + - LDAPPW + - LDAPBN + - DETAILED_LOGGING + - LOG_ALL + - PGUSER + - PGPASS + - PGHOST + - PGPORT + - PGDATABASE + +# Use the following to automatically copy your bundle upon creation via `yesod +# keter`. Uses `scp` internally, so you can set it to a remote destination +# copy-to: user@host:/opt/keter/incoming/ +copy-to: root@uni2work.ifi.lmu.de:/opt/keter/incoming/ +copy-to-args: [] + + +# If you would like to have Keter automatically create a PostgreSQL database +# and set appropriate environment variables for it to be discovered, uncomment +# the following line. +plugins: {} diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs index 4e97d5c1c..1d5e19fe2 100644 --- a/src/Handler/Sheet.hs +++ b/src/Handler/Sheet.hs @@ -606,7 +606,7 @@ getSCorrR tid csh shn = do FormMissing -> return () let - formTitle = MsgSheetCorrectorsTitle tid csh shn + -- formTitle = MsgSheetCorrectorsTitle tid csh shn formText = Nothing :: Maybe (SomeMessage UniWorX) actionUrl = CSheetR tid csh shn SCorrR -- actionUrl = CSheetR tid csh shn SShowR